MDEV-6720 - enable connection log in mysqltest by default

1 files changed, 50 insertions, 44 deletions

diff --git a/mysql-test/r/flush-innodb.result b/mysql-test/r/flush-innodb.result
index d596ffbbd51..bd09f0d62dc 100644
--- a/mysql-test/r/flush-innodb.result
+++ b/mysql-test/r/flush-innodb.result
@@ -71,26 +71,26 @@ DROP VIEW v1;
 #
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT) engine= InnoDB;
 CREATE TABLE t2 (a INT) engine= InnoDB;
-# Connection con1
+connect  con1, localhost, root;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1, 1);
-# Connection default
+connection default;
 # Should be blocked
 # Sending:
 FLUSH TABLES t1 FOR EXPORT;
-# Connection con1
+connection con1;
 COMMIT;
-# Connection default
+connection default;
 # Reaping: FLUSH TABLES t1 FOR EXPORT
-# Connection con1
+connection con1;
 # Should not be blocked
 INSERT INTO t2 VALUES (1);
 # Should be blocked
 # Sending:
 INSERT INTO t1 VALUES (2, 2);
-# Connection default
+connection default;
 UNLOCK TABLES;
-# Connection con1
+connection con1;
 # Reaping: INSERT INTO t1 VALUES (2, 2);
 # Test 3: Read operations should not be affected.
 # 
@@ -99,17 +99,17 @@ SELECT * FROM t1;
 a	b
 1	1
 2	2
-# Connection default
+connection default;
 # Should not be blocked
 FLUSH TABLES t1 FOR EXPORT;
-# Connection con1
+connection con1;
 COMMIT;
 # Should not be blocked
 SELECT * FROM t1;
 a	b
 1	1
 2	2
-# Connection default
+connection default;
 UNLOCK TABLES;
 # Test 4: Blocked by DDL, blocks DDL.
 #
@@ -118,39 +118,40 @@ SELECT * FROM t1;
 a	b
 1	1
 2	2
-# Connection con2
+connect  con2, localhost, root;
 # Sending:
 ALTER TABLE t1 ADD INDEX i1(b);
-# Connection con1
+connection con1;
 # Should be blocked
 FLUSH TABLE t1 FOR EXPORT;
-# Connection default
+connection default;
 COMMIT;
-# Connection con2
+connection con2;
 # Reaping ALTER TABLE ...
-# Connection con1
+connection con1;
 # Reaping FLUSH TABLE t1 FOR EXPORT
 UNLOCK TABLES;
-# Connection default
+connection default;
 FLUSH TABLE t1 FOR EXPORT;
-# Connection con2
+connection con2;
 # Should be blocked
 DROP TABLE t1;
-# Connection default
+connection default;
 UNLOCK TABLES;
-# Connection con2
+connection con2;
 # Reaping DROP TABLE t1
-# Connection default
+disconnect con2;
+connection default;
 DROP TABLE t2;
 # Test 5: Compatibilty with FLUSH TABLES WITH READ LOCK
 #
 CREATE TABLE t1(a INT) engine= InnoDB;
 FLUSH TABLES WITH READ LOCK;
-# Connection con1
+connection con1;
 # This should not block
 FLUSH TABLE t1 FOR EXPORT;
 UNLOCK TABLES;
-# Connection default
+connection default;
 UNLOCK TABLES;
 DROP TABLE t1;
 # Test 6: Unsupported storage engines.
@@ -159,8 +160,9 @@ CREATE TABLE t1(a INT) engine= MEMORY;
 FLUSH TABLE t1 FOR EXPORT;
 ERROR HY000: Storage engine MEMORY of the table `test`.`t1` doesn't have this option
 DROP TABLE t1;
-# Connection con1
-# Connection defalt
+connection con1;
+disconnect con1;
+connection default;
 # Test 7: Check privileges required.
 # in flush-innodb-notembedded.test
 # Test 8: FLUSH TABLE <table_list> FOR EXPORT is incompatible
@@ -169,38 +171,39 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (a INT) engine= InnoDB;
 CREATE TABLE t2 (a INT) engine= InnoDB;
-# Connection con1
+connect  con1, localhost, root;
 FLUSH TABLE t1 FOR EXPORT;
-# Connection default
+connection default;
 # This should not block
 FLUSH TABLE t2 FOR EXPORT;
 UNLOCK TABLES;
 # This should block
 # Sending:
 FLUSH TABLE t1 FOR EXPORT;
-# Connection con1
+connection con1;
 UNLOCK TABLES;
-# Connection default
+connection default;
 # Reaping: FLUSH TABLE t1 FOR EXPORT
 UNLOCK TABLES;
 # Test 9: LOCK TABLES ... READ is not affected
 #
 LOCK TABLE t1 READ;
-# Connection con1
+connection con1;
 # Should not block
 FLUSH TABLE t1 FOR EXPORT;
 UNLOCK TABLES;
-# Connection default
+connection default;
 UNLOCK TABLES;
 FLUSH TABLE t1 FOR EXPORT;
-# Connection con1
+connection con1;
 # Should not block
 LOCK TABLE t1 READ;
 UNLOCK TABLES;
-# Connection default
+connection default;
 UNLOCK TABLES;
-# Connection con1
-# Connection default
+connection con1;
+disconnect con1;
+connection default;
 DROP TABLE t1, t2;
 # Test 10: Lock is released if transaction is started after doing
 #          'flush table..' in same session
@@ -217,30 +220,30 @@ UNLOCK TABLES;
 DROP TABLE t1;
 # Test 11: Test 'flush table with fully qualified table names
 #          and with syntax local/NO_WRITE_TO_BINLOG
-# Connection con1
-# Connection default
+connect  con1, localhost, root;
+connection default;
 CREATE TABLE t1 ( i INT ) ENGINE = Innodb;
 INSERT INTO t1 VALUES (100),(200);
 FLUSH LOCAL TABLES test.t1 FOR EXPORT;
-# Connection con1
+connection con1;
 # Should be blocked
 # Sending:
 FLUSH LOCAL TABLES t1 FOR EXPORT;
-# Connection default
+connection default;
 UNLOCK TABLE;
-# Connection con1
+connection con1;
 # Reaping: FLUSH LOCAL TABLES t1 FOR EXPORT
 SELECT * FROM t1 ORDER BY i;
 i
 100
 200
-# Connection default
+connection default;
 # Should be blocked
 # Sending:
 FLUSH NO_WRITE_TO_BINLOG TABLES test.t1 FOR EXPORT;
-# Connection con1
+connection con1;
 UNLOCK TABLES;
-# Connection default
+connection default;
 # Reaping: FLUSH NO_WRITE_TO_BINLOG TABLES test.t1 FOR EXPORT
 SELECT * FROM t1 ORDER BY i;
 i
@@ -250,7 +253,7 @@ UNLOCK TABLE;
 DROP TABLE t1;
 # Test 12: Active transaction get committed if user execute
 #          "FLUSH TABLE ... FOR EXPORT" or "LOCK TABLE.."
-# Connection default
+connection default;
 CREATE TABLE t1 ( i INT ) ENGINE = Innodb;
 INSERT INTO t1 VALUES (100),(200);
 START TRANSACTION;
@@ -278,7 +281,7 @@ UNLOCK TABLES;
 DROP TABLE t1;
 # Test 13: Verify "FLUSH TABLE ... FOR EXPORT" and "LOCK TABLE.."
 #          in same session   
-# Connection default
+connection default;
 CREATE TABLE t1 ( i INT ) ENGINE = Innodb;
 # Lock table 
 LOCK TABLES test.t1 WRITE;
@@ -294,6 +297,9 @@ ERROR HY000: Can't execute the given command because you have active locked tabl
 LOCK TABLES test.t1 WRITE;
 UNLOCK TABLES;
 DROP TABLE t1;
+connection con1;
+disconnect con1;
+connection default;
 # Reset innodb_file_per_table
 SET GLOBAL innodb_file_per_table= @old_innodb_file_per_table;
 # End of 5.6 tests