Clean up innodb.innodb-read-view

mysql-test/suite/innodb/r/innodb-read-view.result

@@ -196,7 +196,6 @@ DROP TABLE t2;
 # Bug 21433768: NON-REPEATABLE READ WITH REPEATABLE READ ISOLATION
 #
 connect  con1,localhost,root,,;
-# connection con1
 CREATE TABLE t1(col1 INT PRIMARY KEY, col2 INT) ENGINE = InnoDB;
 INSERT INTO t1 values (1, 0), (2, 0);
 SELECT * FROM t1 ORDER BY col1;
@@ -208,7 +207,6 @@ UPDATE t1 SET col2 = 100;
 SET DEBUG_SYNC = 'after_trx_committed_in_memory SIGNAL s1 WAIT_FOR s2';
 COMMIT;;
 connection default;
-# connection default
 SET DEBUG_SYNC = 'now WAIT_FOR s1';
 UPDATE t1 SET col2 = col2 + 10 where col1 = 1;
 COMMIT;
@@ -218,10 +216,7 @@ col1	col2
 2	100
 SET DEBUG_SYNC = 'now SIGNAL s2';
 connection con1;
-# connection con1
-# reap COMMIT for con1
-connection default;
-# connection default
 disconnect con1;
+connection default;
 DROP TABLE t1;
 SET DEBUG_SYNC= 'RESET';

mysql-test/suite/innodb/t/innodb-read-view.test

@@ -1,5 +1,6 @@
 # DEBUG_SYNC must be compiled in.
 --source include/have_debug_sync.inc
+--source include/have_debug.inc
 
 # We need to test the use case:
 #    a. Create a transaction T1 that will be promoted to RW.
@@ -176,7 +177,6 @@ DROP TABLE t2;
 --echo #
 
 --connect (con1,localhost,root,,)
---echo # connection con1
 
 CREATE TABLE t1(col1 INT PRIMARY KEY, col2 INT) ENGINE = InnoDB;
 INSERT INTO t1 values (1, 0), (2, 0);
@@ -188,7 +188,6 @@ SET DEBUG_SYNC = 'after_trx_committed_in_memory SIGNAL s1 WAIT_FOR s2';
 --send COMMIT;
 
 connection default;
---echo # connection default
 SET DEBUG_SYNC = 'now WAIT_FOR s1';
 UPDATE t1 SET col2 = col2 + 10 where col1 = 1;
 COMMIT;
@@ -197,18 +196,13 @@ SELECT * FROM t1 ORDER BY col1;
 SET DEBUG_SYNC = 'now SIGNAL s2';
 
 connection con1;
---echo # connection con1
---echo # reap COMMIT for con1
 reap;
+disconnect con1;
 
 connection default;
---echo # connection default
-disconnect con1;
 
 DROP TABLE t1;
 
 # Clean up resources used in this test case.
---disable_warnings
 SET DEBUG_SYNC= 'RESET';
---enable_warnings
 --source include/wait_until_count_sessions.inc