MDEV-6720 - enable connection log in mysqltest by default

1 files changed, 0 insertions, 35 deletions

diff --git a/mysql-test/t/lock_sync.test b/mysql-test/t/lock_sync.test
index ef79cc2c0f4..c090e3a1d93 100644
--- a/mysql-test/t/lock_sync.test
+++ b/mysql-test/t/lock_sync.test
@@ -231,7 +231,6 @@ let $con_aux1= con1;
 let $con_aux2= con2; 
 let $table= t1;
 
---echo # Switch to connection 'con1'.
 connection con1;
 --echo # Cache all functions used in the tests below so statements
 --echo # calling them won't need to open and lock mysql.proc table
@@ -259,7 +258,6 @@ show create function f15;
 show create function f16;
 show create function f17;
 --enable_result_log
---echo # Switch back to connection 'default'.
 connection default;
 
 --echo #
@@ -301,13 +299,11 @@ let $restore_table= t2;
 --echo # target table and thus does not take any lock on it.
 --echo # We check this for completeness of coverage.
 lock table t1 write;
---echo # Switching to connection 'con1'.
 connection con1;
 --echo # This statement should not be blocked.
 --disable_result_log
 describe t1;
 --enable_result_log
---echo # Switching to connection 'default'.
 connection default;
 unlock tables;
 
@@ -316,7 +312,6 @@ unlock tables;
 --echo # 
 --echo # The above is true for SHOW statements as well.
 lock table t1 write;
---echo # Switching to connection 'con1'.
 connection con1;
 --echo # These statements should not be blocked.
 # The below test for SHOW CREATE TABLE is disabled until bug 52593
@@ -328,7 +323,6 @@ show create table t1;
 --disable_result_log
 show keys from t1;
 --enable_result_log
---echo # Switching to connection 'default'.
 connection default;
 unlock tables;
 
@@ -917,12 +911,10 @@ insert into t1 values (1);
 --echo # the first statement after it acquires TL_WRITE_ALLOW_WRITE lock.
 select get_lock("lock_bug45143_wait", 0);
 
---echo # Switch to connection 'con_bug45143_1'.
 connection con_bug45143_1;
 --echo # Sending:
 --send insert into t1 values (get_lock("lock_bug45143_wait", 100));
 
---echo # Switch to connection 'con_bug45143_2'.
 connection con_bug45143_2;
 --echo # Wait until the above INSERT takes TL_WRITE_ALLOW_WRITE lock on 't1'
 --echo # and then gets blocked on user lock 'lock_bug45143_wait'.
@@ -936,7 +928,6 @@ set debug_sync='thr_multi_lock_after_thr_lock SIGNAL parked WAIT_FOR go';
 --echo # Sending:
 --send select count(*) > 0 from t1 as a, t1 as b for update;
 
---echo # Switch to connection 'con_bug45143_3'.
 connection con_bug45143_3;
 --echo # Wait until the above SELECT ... FOR UPDATE is blocked after
 --echo # acquiring lock for the the first instance of 't1'.
@@ -944,7 +935,6 @@ set debug_sync= 'now WAIT_FOR parked';
 --echo # Send LOCK TABLE statement which will try to get TL_WRITE lock on 't1':
 --send lock table v1 write;
 
---echo # Switch to connection 'default'.
 connection default;
 --echo # Wait until this LOCK TABLES statement starts waiting for table lock.
 let $wait_condition= select count(*)= 1 from information_schema.processlist
@@ -958,17 +948,14 @@ let $wait_condition= select count(*)= 1 from information_schema.processlist
 --echo # on this table and also there is a thread waiting for a TL_WRITE on it.
 set debug_sync= 'now SIGNAL go';
 
---echo # Switch to connection 'con_bug45143_2'.
 connection con_bug45143_2;
 --echo # Reap SELECT ... FOR UPDATE
 --reap
 
---echo # Switch to connection 'default'.
 connection default;
 --echo # Resume execution of the INSERT statement.
 select release_lock("lock_bug45143_wait");
 
---echo # Switch to connection 'con_bug45143_1'.
 connection con_bug45143_1;
 --echo # Reap INSERT statement.
 --echo # In Statement and Mixed replication mode we get here "Unsafe 
@@ -979,13 +966,11 @@ connection con_bug45143_1;
 --enable_warnings
 
 
---echo # Switch to connection 'con_bug45143_3'.
 connection con_bug45143_3;
 --echo # Reap LOCK TABLES statement.
 --reap
 unlock tables;
 
---echo # Switch to connection 'default'.
 connection default;
 --echo # Do clean-up.
 disconnect con_bug45143_1;
@@ -1008,17 +993,14 @@ DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1(id INT);
 CREATE TABLE t2(id INT);
 
---echo # Connection con2
 connect (con2, localhost, root);
 START TRANSACTION;
 SELECT * FROM t1;
 
---echo # Connection default
 connection default;
 --echo # Sending:
 --send ALTER TABLE t1 ADD COLUMN j INT
 
---echo # Connection con2
 connection con2;
 let $wait_condition=
   SELECT COUNT(*) = 1 FROM information_schema.processlist
@@ -1031,7 +1013,6 @@ INSERT INTO t2 SELECT * FROM t1;
 
 COMMIT;
 
---echo # Connection default
 connection default;
 --echo # Reaping ALTER TABLE t1 ADD COLUMN j INT
 --reap
@@ -1047,27 +1028,23 @@ disconnect con2;
 CREATE EVENT e1 ON SCHEDULE EVERY 5 HOUR DO SELECT 1;
 CREATE EVENT e2 ON SCHEDULE EVERY 5 HOUR DO SELECT 2;
 
---echo # Connection con1
 connect(con1, localhost, root);
 SET DEBUG_SYNC="before_lock_tables_takes_lock SIGNAL drop WAIT_FOR query";
 --echo # Sending:
 --send DROP EVENT e1;
 
---echo # Connection default
 connection default;
 SET DEBUG_SYNC="now WAIT_FOR drop";
 SELECT name FROM mysql.event, INFORMATION_SCHEMA.GLOBAL_VARIABLES
   WHERE definer = VARIABLE_VALUE;
 SET DEBUG_SYNC="now SIGNAL query";
 
---echo # Connection con1
 connection con1;
 --echo # Reaping: DROP EVENT t1
 --reap
 disconnect con1;
 --source include/wait_until_disconnected.inc
 
---echo # Connection default
 connection default;
 DROP EVENT e2;
 SET DEBUG_SYNC="RESET";
@@ -1088,26 +1065,22 @@ INSERT INTO t1 VALUES (1), (2);
 connect (con1, localhost, root);
 connect (con2, localhost, root);
 
---echo # Connection con1
 connection con1;
 SET SESSION lock_wait_timeout= 1;
 SET DEBUG_SYNC= 'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze';
 --echo # Sending:
 --send OPTIMIZE TABLE t1
 
---echo # Connection con2
 connection con2;
 SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
 SET DEBUG_SYNC= 'after_lock_tables_takes_lock SIGNAL thrlock WAIT_FOR release_thrlock';
 --echo # Sending:
 --send INSERT INTO t1 VALUES (3)
 
---echo # Connection default
 connection default;
 SET DEBUG_SYNC= 'now WAIT_FOR thrlock';
 SET DEBUG_SYNC= 'now SIGNAL opti_analyze';
 
---echo # Connection con1
 connection con1;
 --echo # Reaping: OPTIMIZE TABLE t1
 --reap
@@ -1115,14 +1088,12 @@ SET DEBUG_SYNC= 'now SIGNAL release_thrlock';
 disconnect con1;
 --source include/wait_until_disconnected.inc
 
---echo # Connection con2
 connection con2;
 --echo # Reaping: INSERT INTO t1 VALUES (3)
 --reap
 disconnect con2;
 --source include/wait_until_disconnected.inc
 
---echo # Connection default
 connection default;
 DROP TABLE t1;
 SET DEBUG_SYNC= 'RESET';
@@ -1144,7 +1115,6 @@ CREATE VIEW v1 AS SELECT * FROM t1 WHERE f1() = 1;
 DROP FUNCTION f1;
 connect(con2, localhost, root);
 
---echo # Connection con1
 connect (con1, localhost, root);
 # Need to trigger this sync point at least twice in order to
 # get valgrind test failures without the patch
@@ -1152,7 +1122,6 @@ SET DEBUG_SYNC= 'open_tables_after_open_and_process_table SIGNAL opened WAIT_FOR
 --echo # Sending:
 --send SHOW CREATE VIEW v1
 
---echo # Connection con2
 connection con2;
 SET DEBUG_SYNC= 'now WAIT_FOR opened';
 SET DEBUG_SYNC= 'now SIGNAL dropped';
@@ -1160,7 +1129,6 @@ SET DEBUG_SYNC= 'now WAIT_FOR opened';
 --echo # Sending:
 --send FLUSH TABLES
 
---echo # Connection default
 connection default;
 --echo # Waiting for FLUSH TABLES to be blocked.
 let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.processlist
@@ -1168,17 +1136,14 @@ let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.processlist
 --source include/wait_condition.inc
 SET DEBUG_SYNC= 'now SIGNAL dropped';
 
---echo # Connection con1
 connection con1;
 --echo # Reaping: SHOW CREATE VIEW v1
 --reap
 
---echo # Connection con2
 connection con2;
 --echo # Reaping: FLUSH TABLES
 --reap
 
---echo # Connection default
 connection default;
 SET DEBUG_SYNC= 'RESET';
 DROP VIEW v1;