Fixed test case after HANDLER CLOSE fix

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

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;

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;