diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 23:41:15 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 23:41:15 +0000 |
| commit | 606d13eb26e42e2010880263e9aac69c9ec0b751 (patch) | |
| tree | 7cc0d062758280a305eb5fc449d84b91d6fa93f7 /mysql-test/mysql-test-run.sh | |
| parent | e2ca20ca9a395d89960c6e0be9b89f1840919c53 (diff) | |
| download | mariadb-git-606d13eb26e42e2010880263e9aac69c9ec0b751.tar.gz | |
make sure old mysqld's are shutdown
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 930087f880a..19649166822 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1543,14 +1543,17 @@ then then # Ensure that no old mysqld test servers are running $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 + $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 + $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --host=$hostname --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1 sleep_until_file_deleted 0 $MASTER_MYPID + sleep_until_file_deleted 0 $MASTER_MYPID"1" sleep_until_file_deleted 0 $SLAVE_MYPID else - rm $MASTER_MYPID $SLAVE_MYPID + rm $MASTER_MYPID $MASTER_MYPID"1" $SLAVE_MYPID fi # Kill any running managers |