1 files changed, 35 insertions, 9 deletions
diff --git a/mysql-test/suite/handler/interface.result b/mysql-test/suite/handler/interface.result
index 89dec29f412..4d5a385df0f 100644
--- a/mysql-test/suite/handler/interface.result
+++ b/mysql-test/suite/handler/interface.result
@@ -168,15 +168,16 @@ create table t1 (c1 int);
 create table t2 (c1 int);
 insert into t1 values (1);
 insert into t2 values (2);
-connection: default
 handler t1 open;
 handler t1 read first;
 c1
 1
-connection: flush
+connect  flush,localhost,root,,;
+connection flush;
 flush tables;
-connection: waiter 
-connection: default
+connect  waiter,localhost,root,,;
+connection waiter;
+connection default;
 handler t2 open;
 handler t2 read first;
 c1
@@ -186,17 +187,20 @@ c1
 1
 handler t1 close;
 handler t2 close;
+connection flush;
+connection default;
 drop table t1,t2;
+disconnect flush;
 drop table if exists t1, t0;
 create table t1 (c1 int);
-connection: default
 handler t1 open;
 handler t1 read first;
 c1
-connection: flush
+connect  flush,localhost,root,,;
+connection flush;
 rename table t1 to t0;
-connection: waiter 
-connection: default
+connection waiter;
+connection default;
 #
 # RENAME placed two pending locks and waits.
 # When HANDLER t0 OPEN does open_tables(), it calls
@@ -211,12 +215,18 @@ connection: default
 #
 handler t0 open;
 handler t0 close;
-connection: flush
+connection flush;
 handler t1 read next;
 ERROR 42S02: Unknown table 't1' in HANDLER
 handler t1 close;
 ERROR 42S02: Unknown table 't1' in HANDLER
+connection default;
 drop table t0;
+connection flush;
+disconnect flush;
+connection waiter;
+disconnect waiter;
+connection default;
 create table t1 (a int);
 handler t1 open as t1_alias;
 drop table t1;
@@ -260,25 +270,36 @@ unlock tables;
 drop table t1;
 handler t1 read a next;
 ERROR 42S02: Unknown table 't1' in HANDLER
+connect con1,localhost,root,,;
+connect con2,localhost,root,,;
+connection default;
 drop table if exists t1;
 # First test case which is supposed trigger the execution
 # path on which problem was discovered.
 create table t1 (a int not null);
 insert into t1 values (1);
 handler t1 open;
+connection con1;
 lock table t1 write;
 alter table t1 engine=csv;
+connection con2;
+connection default;
 handler t1 read a next;
 ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option
 handler t1 close;
+connection con1;
 unlock tables;
 drop table t1;
 # Now test case which was reported originally but which no longer
 # triggers execution path which has caused the problem.
+connection default;
 create table t1 (a int not null);
 insert into t1 values (1);
 handler t1 open;
+connection con1;
 alter table t1 engine=csv;
+connection con2;
+connection default;
 # Since S metadata lock was already acquired at HANDLER OPEN time
 # and TL_READ lock requested by HANDLER READ is compatible with
 # ALTER's TL_WRITE_ALLOW_READ the below statement should succeed
@@ -287,7 +308,12 @@ handler t1 read next;
 a
 1
 handler t1 close;
+connection con1;
 drop table t1;
+disconnect con1;
+connection con2;
+disconnect con2;
+connection default;
 USE information_schema;
 HANDLER COLUMNS OPEN;
 ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema