1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed test case after HANDLER CLOSE fix

Browse Source 
mysql-test/mysql-test-run.sh:
  Safety fix
This commit is contained in:
unknown 2001-12-23 03:03:09 +02:00
parent b5f5980497
commit 27f652efef
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mysql-test/mysql-test-run.sh
View File

@ -903,16 +903,18 @@ stop_slave ()
manager_term $slave_ident manager_term $slave_ident
if [ $? != 0 ] && [ -f $slave_pid ] if [ $? != 0 ] && [ -f $slave_pid ]
then # try harder! then # try harder!
$ECHO "slave not cooperating with mysqladmin, will try manual kill" $ECHO "slave not cooperating with mysqladmin, will try manual kill"
kill `$CAT $slave_pid` kill `$CAT $slave_pid`
sleep_until_file_deleted $slave_pid sleep_until_file_deleted $slave_pid
if [ -f $slave_pid ] ; then if [ -f $slave_pid ] ; then
$ECHO "slave refused to die. Sending SIGKILL" $ECHO "slave refused to die. Sending SIGKILL"
kill -9 `$CAT $slave_pid` kill -9 `$CAT $slave_pid`
$RM -f $slave_pid $RM -f $slave_pid
else else
$ECHO "slave responded to SIGTERM " $ECHO "slave responded to SIGTERM "
fi fi
else
sleep $SLEEP_TIME_AFTER_RESTART
fi fi
eval "SLAVE$1_RUNNING=0" eval "SLAVE$1_RUNNING=0"
fi fi
@ -925,16 +927,18 @@ stop_master ()
manager_term master manager_term master
if [ $? != 0 ] && [ -f $MASTER_MYPID ] if [ $? != 0 ] && [ -f $MASTER_MYPID ]
then # try harder! then # try harder!
$ECHO "master not cooperating with mysqladmin, will try manual kill" $ECHO "master not cooperating with mysqladmin, will try manual kill"
kill `$CAT $MASTER_MYPID` kill `$CAT $MASTER_MYPID`
sleep_until_file_deleted $MASTER_MYPID sleep_until_file_deleted $MASTER_MYPID
if [ -f $MASTER_MYPID ] ; then if [ -f $MASTER_MYPID ] ; then
$ECHO "master refused to die. Sending SIGKILL" $ECHO "master refused to die. Sending SIGKILL"
kill -9 `$CAT $MASTER_MYPID` kill -9 `$CAT $MASTER_MYPID`
$RM -f $MASTER_MYPID $RM -f $MASTER_MYPID
else else
$ECHO "master responded to SIGTERM " $ECHO "master responded to SIGTERM "
fi fi
else
sleep $SLEEP_TIME_AFTER_RESTART
fi fi
MASTER_RUNNING=0 MASTER_RUNNING=0
fi fi

1
mysql-test/r/innodb.result
View File

@ -909,4 +909,5 @@ Table handler for 't1' doesn't have this option
handler t1 read t first; handler t1 read t first;
Unknown table 't1' in HANDLER Unknown table 't1' in HANDLER
handler t1 close; handler t1 close;
Unknown table 't1' in HANDLER
drop table t1; drop table t1;

1
mysql-test/t/innodb.test
View File

@ -574,5 +574,6 @@ desc t1;
handler t1 open t1; handler t1 open t1;
--error 1109 --error 1109
handler t1 read t first; handler t1 read t first;
--error 1109
handler t1 close; handler t1 close;
drop table t1; drop table t1;