MDEV-6720 - enable connection log in mysqltest by default

1 files changed, 31 insertions, 21 deletions

diff --git a/mysql-test/r/schema.result b/mysql-test/r/schema.result
index bb6dbd65f84..6d8271a49f3 100644
--- a/mysql-test/r/schema.result
+++ b/mysql-test/r/schema.result
@@ -16,80 +16,90 @@ drop schema foo;
 # Bug #48940 MDL deadlocks against mysql_rm_db
 #
 DROP SCHEMA IF EXISTS schema1;
-# Connection default
+connect con2, localhost, root;
+connection default;
 CREATE SCHEMA schema1;
 CREATE TABLE schema1.t1 (a INT);
 SET autocommit= FALSE;
 INSERT INTO schema1.t1 VALUES (1);
-# Connection 2
+connection con2;
 DROP SCHEMA schema1;
-# Connection default
+connection default;
 ALTER SCHEMA schema1 DEFAULT CHARACTER SET utf8;
 Got one of the listed errors
 SET autocommit= TRUE;
-# Connection 2
-# Connection default
+connection con2;
+connection default;
+disconnect con2;
 #
 # Bug #49988 MDL deadlocks with mysql_create_db, reload_acl_and_cache
 #
 DROP SCHEMA IF EXISTS schema1;
-# Connection default
+connect  con2, localhost, root;
+connection default;
 CREATE SCHEMA schema1;
 CREATE TABLE schema1.t1 (id INT);
 LOCK TABLE schema1.t1 WRITE;
-# Connection con2
+connection con2;
 DROP SCHEMA schema1;
-# Connection default
+connection default;
 # CREATE SCHEMA used to give a deadlock.
 # Now we prohibit CREATE SCHEMA in LOCK TABLES mode.
 CREATE SCHEMA IF NOT EXISTS schema1;
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
 # UNLOCK TABLES so DROP SCHEMA can continue.
 UNLOCK TABLES;
-# Connection con2
-# Connection default
+connection con2;
+connection default;
+disconnect con2;
 #
 # Bug#54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER
 #
 CREATE DATABASE db1;
 CREATE TABLE db1.t1 (a INT);
 INSERT INTO db1.t1 VALUES (1), (2);
-# Connection con1
+connect  con1, localhost, root;
 HANDLER db1.t1 OPEN;
-# Connection default
+connection default;
 # Sending:
 DROP DATABASE db1;
-# Connection con2
-# Connection con1
+connect  con2, localhost, root;
+connection con1;
 CREATE DATABASE db2;
 ALTER DATABASE db2 DEFAULT CHARACTER SET utf8;
 DROP DATABASE db2;
 HANDLER t1 CLOSE;
-# Connection default
+connection default;
 # Reaping: DROP DATABASE db1
+disconnect con1;
+disconnect con2;
 #
 # Tests for increased CREATE/ALTER/DROP DATABASE concurrency with
 # database name locks.
 # 
 DROP DATABASE IF EXISTS db1;
 DROP DATABASE IF EXISTS db2;
-# Connection default
+connect  con2, localhost, root;
+connect  con3, localhost, root;
+connection default;
 CREATE DATABASE db1;
 CREATE TABLE db1.t1 (id INT);
 START TRANSACTION;
 INSERT INTO db1.t1 VALUES (1);
-# Connection 2
+connection con2;
 # DROP DATABASE should block due to the active transaction
 # Sending:
 DROP DATABASE db1;
-# Connection 3
+connection con3;
 # But it should still be possible to CREATE/ALTER/DROP other databases.
 CREATE DATABASE db2;
 ALTER DATABASE db2 DEFAULT CHARACTER SET utf8;
 DROP DATABASE db2;
-# Connection default
+connection default;
 # End the transaction so DROP DATABASE db1 can continue
 COMMIT;
-# Connection 2
+connection con2;
 # Reaping: DROP DATABASE db1
-# Connection default;
+connection default;
+disconnect con2;
+disconnect con3;