diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-03-01 21:14:13 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-03-01 21:14:13 -0700 |
| commit | 3eb9c0be7df702a8af47daa2d01929704d8a41c9 (patch) | |
| tree | 0e77b2158bac94d79228bc9817a0fc23422a0eea /mysql-test | |
| parent | 2c9879ca0cfd319e939835816cd4501b1d097b0a (diff) | |
| download | mariadb-git-3eb9c0be7df702a8af47daa2d01929704d8a41c9.tar.gz | |
post-merge fixup
BitKeeper/etc/ignore:
Added mysys/test_vsnprintf to the ignore list
mysql-test/mysql-test-run.sh:
post-merge fix
mysys/my_vsnprintf.c:
fixed newly introduced bug
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 34b0caf55ca..68e383e9ce6 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -161,6 +161,10 @@ MASTER_RUNNING=0 MASTER_MYPORT=9306 SLAVE_RUNNING=0 SLAVE_MYPORT=9307 +MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves +MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd +MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log +MYSQL_MANAGER_USER=root NO_SLAVE=0 USER_TEST= |