diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-23 03:03:09 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-23 03:03:09 +0200 |
| commit | 7f53d6cf1e80178bd3c8cf751523f742184ad664 (patch) | |
| tree | 1162f17afaccd0f358349f21455cef3996019ee2 | |
| parent | a58351ed7c2e0e7aa9d0289db30fc8052eef8d7d (diff) | |
| download | mariadb-git-mysql-4.0.1.tar.gz | |
Fixed test case after HANDLER CLOSE fixmysql-4.0.1
mysql-test/mysql-test-run.sh:
Safety fix
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 44 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 1 |
3 files changed, 26 insertions, 20 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index a2593a766ca..3c8760ad7e5 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 71b9a6d27a0..8664cab0b84 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 0b738809e9c..9440886ff1e 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; |