MDEV-6720 - enable connection log in mysqltest by default

1 files changed, 0 insertions, 37 deletions

diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index aaf931a2e7f..b6000ffced1 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -345,8 +345,6 @@ SET DEBUG_SYNC = 'RESET';
 --echo # depending on platform.
 --echo #
 
---echo
---echo # Connection: con1.
 --connection con1
 let $ID= `SELECT @id := CONNECTION_ID()`;
 SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
@@ -385,14 +383,11 @@ connect (dml, localhost, root, , );
 connect (ddl, localhost, root, , );
 
 --echo # Test for RENAME TABLE
---echo # Switching to connection 'blocker'
 connection blocker;
 lock table t1 read;
---echo # Switching to connection 'ddl'
 connection ddl;
 let $ID= `select connection_id()`;
 --send rename table t1 to t2
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -401,14 +396,12 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
 
 --echo # Test for DROP TABLE
 --send drop table t1
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -417,14 +410,12 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
 
 --echo # Test for CREATE TRIGGER
 --send create trigger t1_bi before insert on t1 for each row set @a:=1
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -433,7 +424,6 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
@@ -443,7 +433,6 @@ connection ddl;
 --echo #
 --echo # Full-blown ALTER which should copy table
 --send alter table t1 add column j int
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -452,14 +441,12 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
 
 --echo # Two kinds of simple ALTER
 --send alter table t1 rename to t2
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -468,12 +455,10 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
 --send alter table t1 disable keys
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -482,13 +467,11 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
 --echo # Fast ALTER
 --send alter table t1 alter column i set default 100
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -497,20 +480,16 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
 --echo # Special case which is triggered only for MERGE tables.
---echo # Switching to connection 'blocker'
 connection blocker;
 unlock tables;
 create table t2 (i int primary key) engine=merge union=(t1);
 lock tables t2 read;
---echo # Switching to connection 'ddl'
 connection ddl;
 --send alter table t2 alter column i set default 100
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -519,21 +498,17 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID ID
 eval kill query $ID;
---echo # Switching to connection 'ddl'
 connection ddl;
 --error ER_QUERY_INTERRUPTED
 --reap
 
 --echo # Test for DML waiting for meta-data lock
---echo # Switching to connection 'blocker'
 connection blocker;
 unlock tables;
 lock tables t1 read;
---echo # Switching to connection 'ddl'
 connection ddl;
 # Let us add pending exclusive metadata lock on t2
 --send truncate table t1
---echo # Switching to connection 'dml'
 connection dml;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -542,7 +517,6 @@ let $wait_condition=
 --source include/wait_condition.inc
 let $ID2= `select connection_id()`;
 --send insert into t1 values (1)
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -551,26 +525,20 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID2 ID2
 eval kill query $ID2;
---echo # Switching to connection 'dml'
 connection dml;
 --error ER_QUERY_INTERRUPTED
 --reap
---echo # Switching to connection 'blocker'
 connection blocker;
 unlock tables;
---echo # Switching to connection 'ddl'
 connection ddl;
 --reap
 
 --echo # Test for DML waiting for tables to be flushed
---echo # Switching to connection 'blocker'
 connection blocker;
 lock tables t1 read;
---echo # Switching to connection 'ddl'
 connection ddl;
 --echo # Let us mark locked table t1 as old
 --send flush tables
---echo # Switching to connection 'dml'
 connection dml;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -578,7 +546,6 @@ let $wait_condition=
         info = "flush tables";
 --source include/wait_condition.inc
 --send select * from t1
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -587,19 +554,15 @@ let $wait_condition=
 --source include/wait_condition.inc
 --replace_result $ID2 ID2
 eval kill query $ID2;
---echo # Switching to connection 'dml'
 connection dml;
 --error ER_QUERY_INTERRUPTED
 --reap
---echo # Switching to connection 'blocker'
 connection blocker;
 unlock tables;
---echo # Switching to connection 'ddl'
 connection ddl;
 --reap
 
 --echo # Cleanup.
---echo # Switching to connection 'default'
 connection default;
 drop table t1;
 drop table t2;