MDEV-6720 - enable connection log in mysqltest by default

5 files changed, 0 insertions, 28 deletions

diff --git a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
index df9c06011c2..d73333c3b8d 100644
--- a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
+++ b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
@@ -20,12 +20,10 @@ DELETE FROM t1 WHERE a = 11;
 SELECT * FROM t1;
 
 --connect (con1, localhost, root,,)
---echo # con1 (send)
 --send
 ALTER TABLE t1 TRUNCATE PARTITION pMax;
 
 --connection default
---echo # con default
 let $wait_condition=
   SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
     WHERE STATE = "Waiting for table metadata lock" AND
@@ -36,13 +34,10 @@ SELECT * FROM t1;
 --echo # Commit will allow the TRUNCATE to finish
 COMMIT;
 
---echo # con1 (reap)
 --connection con1
 --reap
---echo # con1 (disconnect)
 --disconnect con1
 --connection default
---echo # default connection
 SELECT * FROM t1;
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/parts/t/partition_exch_qa_6.test b/mysql-test/suite/parts/t/partition_exch_qa_6.test
index bad1e134af7..69b49a32813 100644
--- a/mysql-test/suite/parts/t/partition_exch_qa_6.test
+++ b/mysql-test/suite/parts/t/partition_exch_qa_6.test
@@ -19,7 +19,6 @@ CREATE USER test2@localhost;
 GRANT USAGE ON *.* TO test2@localhost;
 GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
@@ -47,56 +46,44 @@ ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
 SELECT * FROM tsp_00;
 --sorted_result
 SELECT * FROM tsp WHERE a BETWEEN 0 AND 10;
---echo disconnect test2;
 disconnect test2;
 
---echo connection default;
 connection default;
 REVOKE INSERT ON test.* FROM test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
 # Privilege for ALTER and SELECT
 --error ER_TABLEACCESS_DENIED_ERROR
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
---echo disconnect test2;
 disconnect test2;
  
---echo connection default;
 connection default;
 GRANT INSERT ON test.* TO test2@localhost;
 REVOKE CREATE ON test.* FROM test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
 --error ER_TABLEACCESS_DENIED_ERROR
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
---echo disconnect test2;
 disconnect test2;
 
---echo connection default;
 connection default;
 GRANT CREATE ON test.* TO test2@localhost;
 REVOKE DROP ON test.* FROM test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
 # Privilege for ALTER and SELECT
 --error ER_TABLEACCESS_DENIED_ERROR
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
---echo disconnect test2;
 disconnect test2;
  
---echo connection default;
 connection default;
 
 --source suite/parts/inc/part_exch_drop_tabs.inc
 
 DROP USER test2@localhost;
-
diff --git a/mysql-test/suite/parts/t/partition_innodb_status_file.test b/mysql-test/suite/parts/t/partition_innodb_status_file.test
index f066ce5d485..c5793d104db 100644
--- a/mysql-test/suite/parts/t/partition_innodb_status_file.test
+++ b/mysql-test/suite/parts/t/partition_innodb_status_file.test
@@ -6,7 +6,6 @@ INSERT INTO t1 VALUES (0), (1), (2);
 START TRANSACTION;
 UPDATE t1 SET a = 5 WHERE a = 1;
 connect (con1, localhost, root,,);
---echo # Connection con1
 --echo # InnoDB lock timeout and monitor thread runs every 15 seconds
 SET innodb_lock_wait_timeout = 20;
 START TRANSACTION;
@@ -15,6 +14,5 @@ UPDATE t1 SET a = 3 WHERE a = 1;
 COMMIT;
 disconnect con1;
 connection default;
---echo # Connection default
 COMMIT;
 DROP TABLE t1;
diff --git a/mysql-test/suite/parts/t/partition_special_myisam.test b/mysql-test/suite/parts/t/partition_special_myisam.test
index 2eac5b3bf16..5a573259373 100644
--- a/mysql-test/suite/parts/t/partition_special_myisam.test
+++ b/mysql-test/suite/parts/t/partition_special_myisam.test
@@ -50,13 +50,11 @@ let $engine= 'MyISAM';
 CREATE TABLE t1 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f INT )
         ENGINE = MyISAM PARTITION BY HASH(i) PARTITIONS 3;
 
---echo # Connection 1 starts transaction and gets lock
 START TRANSACTION;
 SELECT * FROM t1;
 
 --connect (con2,localhost,root,,)
 SET lock_wait_timeout = 2;
---echo # Connection 2 tries to coalesce partitions (timeout):
 --error ER_LOCK_WAIT_TIMEOUT
 ALTER TABLE t1 COALESCE PARTITION 2;
 
@@ -68,16 +66,13 @@ ALTER TABLE t1 COALESCE PARTITION 2;
 2
 3
 EOF
---echo # Connection 3 tries to load into the table:
 send LOAD DATA INFILE 'load.in' INTO TABLE t1 (f);
 
 --connection default
 --real_sleep 1
---echo # Connection 1 commits the transaction
 COMMIT;
 
 --connection con3
---echo # Connection 3...
 --reap
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/parts/t/rpl_partition.test b/mysql-test/suite/parts/t/rpl_partition.test
index e278b236f7b..529d94b2b31 100644
--- a/mysql-test/suite/parts/t/rpl_partition.test
+++ b/mysql-test/suite/parts/t/rpl_partition.test
@@ -12,7 +12,6 @@ set @old_session_binlog_format=  @@session.binlog_format;
 SET GLOBAL binlog_format = 'ROW';
 SET SESSION binlog_format = 'ROW';
 select @@global.binlog_format, @@session.binlog_format;
---echo [on slave]
 connection slave;
 set @old_global_binlog_format=  @@global.binlog_format;
 set @old_session_binlog_format=  @@session.binlog_format;
@@ -23,7 +22,6 @@ select @@global.binlog_format, @@session.binlog_format;
 # from @@global.binlog_format
 --source include/stop_slave.inc
 --source include/start_slave.inc
---echo [on master]
 connection master;
 
 eval CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
@@ -168,7 +166,6 @@ DROP TABLE t1, t2, t3;
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
 DROP PROCEDURE p3;
---echo [on slave]
 sync_slave_with_master;
 set @@global.binlog_format=  @old_global_binlog_format;
 set @@session.binlog_format=  @old_session_binlog_format;