diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index a2593a766cafbdb77602c92db6244905adc8d6ac..3c8760ad7e5369857510c9db68cfda892938b79c 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -903,16 +903,18 @@ stop_slave () manager_term $slave_ident if [ $? != 0 ] && [ -f $slave_pid ] then # try harder! - $ECHO "slave not cooperating with mysqladmin, will try manual kill" - kill `$CAT $slave_pid` - sleep_until_file_deleted $slave_pid - if [ -f $slave_pid ] ; then - $ECHO "slave refused to die. Sending SIGKILL" - kill -9 `$CAT $slave_pid` - $RM -f $slave_pid - else - $ECHO "slave responded to SIGTERM " - fi + $ECHO "slave not cooperating with mysqladmin, will try manual kill" + kill `$CAT $slave_pid` + sleep_until_file_deleted $slave_pid + if [ -f $slave_pid ] ; then + $ECHO "slave refused to die. Sending SIGKILL" + kill -9 `$CAT $slave_pid` + $RM -f $slave_pid + else + $ECHO "slave responded to SIGTERM " + fi + else + sleep $SLEEP_TIME_AFTER_RESTART fi eval "SLAVE$1_RUNNING=0" fi @@ -925,16 +927,18 @@ stop_master () manager_term master if [ $? != 0 ] && [ -f $MASTER_MYPID ] then # try harder! - $ECHO "master not cooperating with mysqladmin, will try manual kill" - kill `$CAT $MASTER_MYPID` - sleep_until_file_deleted $MASTER_MYPID - if [ -f $MASTER_MYPID ] ; then - $ECHO "master refused to die. Sending SIGKILL" - kill -9 `$CAT $MASTER_MYPID` - $RM -f $MASTER_MYPID - else - $ECHO "master responded to SIGTERM " - fi + $ECHO "master not cooperating with mysqladmin, will try manual kill" + kill `$CAT $MASTER_MYPID` + sleep_until_file_deleted $MASTER_MYPID + if [ -f $MASTER_MYPID ] ; then + $ECHO "master refused to die. Sending SIGKILL" + kill -9 `$CAT $MASTER_MYPID` + $RM -f $MASTER_MYPID + else + $ECHO "master responded to SIGTERM " + fi + else + sleep $SLEEP_TIME_AFTER_RESTART fi MASTER_RUNNING=0 fi diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 71b9a6d27a074e3542932b594add56834da1fa69..8664cab0b84783eecfc67398c1b467270d294ed4 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -909,4 +909,5 @@ Table handler for 't1' doesn't have this option handler t1 read t first; Unknown table 't1' in HANDLER handler t1 close; +Unknown table 't1' in HANDLER drop table t1; diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 0b738809e9c043e2030185886e5ecf07968f47ac..9440886ff1e6ac61d930fa43aa4d9fdcc1da0f55 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -574,5 +574,6 @@ desc t1; handler t1 open t1; --error 1109 handler t1 read t first; +--error 1109 handler t1 close; drop table t1;