1 files changed, 31 insertions, 40 deletions
diff --git a/mysql-test/r/truncate_coverage.result b/mysql-test/r/truncate_coverage.result
index 395c71b2e6b..95e649912e5 100644
--- a/mysql-test/r/truncate_coverage.result
+++ b/mysql-test/r/truncate_coverage.result
@@ -5,48 +5,41 @@ DROP TABLE IF EXISTS t1;
 #
 CREATE TABLE t1 (c1 INT);
 INSERT INTO t1 VALUES (1);
-#
-# connection con1
+connect  con1, localhost, root,,;
 HANDLER t1 OPEN;
-#
-# connection default
+connection default;
 LOCK TABLE t1 WRITE;
 SET DEBUG_SYNC='mdl_upgrade_lock SIGNAL waiting';
 TRUNCATE TABLE t1;
-#
-# connection con2
+connect  con2, localhost, root,,;
 SET DEBUG_SYNC='now WAIT_FOR waiting';
 KILL QUERY @id;
-#
-# connection default
+disconnect con2;
+connection default;
 ERROR 70100: Query execution was interrupted
 UNLOCK TABLES;
-#
-# connection con1
+connection con1;
 # Release shared metadata lock by closing HANDLER.
 HANDLER t1 CLOSE;
-#
-# connection default
+disconnect con1;
+connection default;
 DROP TABLE t1;
 SET DEBUG_SYNC='RESET';
 CREATE TABLE t1 (c1 INT);
 INSERT INTO t1 VALUES (1);
-#
-# connection con1
+connect  con1, localhost, root,,;
 HANDLER t1 OPEN;
-#
-# connection default
+connection default;
 LOCK TABLE t1 WRITE;
 SET DEBUG_SYNC='mdl_upgrade_lock SIGNAL waiting';
 TRUNCATE TABLE t1;
-#
-# connection con2
+connect  con2, localhost, root,,;
 SET DEBUG_SYNC='now WAIT_FOR waiting';
-#
-# connection con1
+disconnect con2;
+connection con1;
 HANDLER t1 CLOSE;
-#
-# connection default
+disconnect con1;
+connection default;
 ERROR 42S02: Table 'test.t1' doesn't exist
 UNLOCK TABLES;
 DROP TABLE t1;
@@ -54,27 +47,22 @@ ERROR 42S02: Unknown table 'test.t1'
 SET DEBUG_SYNC='RESET';
 CREATE TABLE t1 (c1 INT);
 INSERT INTO t1 VALUES (1);
-#
-# connection con1
+connect  con1, localhost, root,,;
 START TRANSACTION;
 INSERT INTO t1 VALUES (2);
-#
-# connection default
+connection default;
 SET DEBUG_SYNC='mdl_acquire_lock_wait SIGNAL waiting';
 TRUNCATE TABLE t1;
-#
-# connection con1
+connection con1;
 SET DEBUG_SYNC='now WAIT_FOR waiting';
 KILL QUERY @id;
-#
-# connection default
+connection default;
 ERROR 70100: Query execution was interrupted
-#
-# connection con1
+connection con1;
 # Release SW lock by committing transaction.
 COMMIT;
-#
-# connection default
+disconnect con1;
+connection default;
 UNLOCK TABLES;
 DROP TABLE t1;
 SET DEBUG_SYNC='RESET';
@@ -86,22 +74,25 @@ SET DEBUG_SYNC='RESET';
 DROP TABLE IF EXISTS t1, m1;
 CREATE TABLE t1(a INT) engine=memory;
 CREATE TABLE m1(a INT) engine=merge UNION(t1);
-# Connection con1
+connect con2, localhost, root;
+connect con1, localhost, root;
 SET DEBUG_SYNC= 'open_tables_after_open_and_process_table SIGNAL opened WAIT_FOR dropped';
 # Sending:
 TRUNCATE TABLE m1;
-# Connection con2
+connection con2;
 SET DEBUG_SYNC= 'now WAIT_FOR opened';
 # Sending:
 FLUSH TABLES;
-# Connection default
+connection default;
 # Waiting for FLUSH TABLES to be blocked.
 SET DEBUG_SYNC= 'now SIGNAL dropped';
-# Connection con1
+connection con1;
 # Reaping: TRUNCATE TABLE m1
 ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
-# Connection con2
+disconnect con1;
+connection con2;
 # Reaping: FLUSH TABLES
-# Connection default
+disconnect con2;
+connection default;
 SET DEBUG_SYNC= 'RESET';
 DROP TABLE m1, t1;