MDEV-6720 - enable connection log in mysqltest by default

1 files changed, 0 insertions, 34 deletions

diff --git a/mysql-test/t/sp-security.test b/mysql-test/t/sp-security.test
index a5df4859d6b..f719cbff11c 100644
--- a/mysql-test/t/sp-security.test
+++ b/mysql-test/t/sp-security.test
@@ -580,8 +580,6 @@ drop database db_bug14533;
 
 # Setup the environment.
 
---echo
---echo ---> connection: root
 --connection con1root
 
 --disable_warnings
@@ -602,8 +600,6 @@ GRANT ALL PRIVILEGES ON mysqltest.* TO mysqltest_2@localhost;
 
 # test case (1).
 
---echo
---echo ---> connection: mysqltest_2_con
 --connection mysqltest_2_con
 
 USE mysqltest;
@@ -614,8 +610,6 @@ CREATE FUNCTION wl2897_f1() RETURNS INT RETURN 1;
 
 # test case (2).
 
---echo
---echo ---> connection: mysqltest_1_con
 --connection mysqltest_1_con
 
 USE mysqltest;
@@ -628,8 +622,6 @@ CREATE DEFINER=root@localhost FUNCTION wl2897_f2() RETURNS INT RETURN 2;
 
 # test case (3).
 
---echo
---echo ---> connection: mysqltest_2_con
 --connection mysqltest_2_con
 
 use mysqltest;
@@ -640,8 +632,6 @@ CREATE DEFINER='a @ b @ c'@localhost FUNCTION wl2897_f3() RETURNS INT RETURN 3;
 
 # test case (4).
 
---echo
---echo ---> connection: con1root
 --connection con1root
 
 USE mysqltest;
@@ -669,8 +659,6 @@ DROP DATABASE mysqltest;
 
 # Prepare environment.
 
---echo
---echo ---> connection: root
 --connection con1root
 
 --disable_warnings
@@ -690,8 +678,6 @@ GRANT ALL PRIVILEGES ON mysqltest.* TO mysqltest_2@localhost;
 
 # Create a procedure/function under u1.
 
---echo
---echo ---> connection: mysqltest_1_con
 --connection mysqltest_1_con
 
 USE mysqltest;
@@ -708,8 +694,6 @@ SELECT bug13198_f1();
 
 # Check that u2 can call the procedure/function.
 
---echo
---echo ---> connection: mysqltest_2_con
 --connection mysqltest_2_con
 
 USE mysqltest;
@@ -720,8 +704,6 @@ SELECT bug13198_f1();
 
 # Drop user u1 (definer of the object);
 
---echo
---echo ---> connection: root
 --connection con1root
 
 --disconnect mysqltest_1_con
@@ -730,8 +712,6 @@ DROP USER mysqltest_1@localhost;
 
 # Check that u2 can not call the procedure/function.
 
---echo
---echo ---> connection: mysqltest_2_con
 --connection mysqltest_2_con
 
 USE mysqltest;
@@ -744,8 +724,6 @@ SELECT bug13198_f1();
 
 # Cleanup.
 
---echo
---echo ---> connection: root
 --connection con1root
 
 --disconnect mysqltest_2_con
@@ -767,8 +745,6 @@ user19857@localhost;
 SELECT Host,User,Password FROM mysql.user WHERE User='user19857';
 
 --connect (mysqltest_2_con,localhost,user19857,meow,test)
---echo
---echo ---> connection: mysqltest_2_con
 --connection mysqltest_2_con
 
 USE test;
@@ -790,8 +766,6 @@ SHOW CREATE PROCEDURE test.sp19857;
 
 DROP PROCEDURE IF EXISTS test.sp19857;
 
---echo
---echo ---> connection: root
 --connection con1root
 
 --disconnect mysqltest_2_con
@@ -949,7 +923,6 @@ create database mysqltest_db;
 create user bug57061_user@localhost;
 create function mysqltest_db.f1() returns int return 0;
 create procedure mysqltest_db.p1() begin end;
---echo # Connect as user 'bug57061_user@localhost'
 connect (conn1, localhost, bug57061_user,,);
 --echo # Attempt to drop routine on which user doesn't have privileges
 --echo # should result in the same 'access denied' type of error whether
@@ -962,7 +935,6 @@ drop procedure if exists mysqltest_db.p_does_not_exist;
 drop function if exists mysqltest_db.f1;
 --error ER_PROCACCESS_DENIED_ERROR
 drop procedure if exists mysqltest_db.p1;
---echo # Connection 'default'.
 connection default;
 disconnect conn1;
 drop user bug57061_user@localhost;
@@ -983,23 +955,19 @@ CREATE PROCEDURE db1.p1() SELECT 1;
 CREATE USER user2@localhost IDENTIFIED BY '';
 GRANT SELECT(db) ON mysql.proc TO user2@localhost;
  
---echo # Connection con2 as user2
 connect (con2, localhost, user2);
 --echo # The statement below before disclosed info from body_utf8 column.
 --error ER_SP_DOES_NOT_EXIST
 SHOW CREATE PROCEDURE db1.p1;
 
 --echo # Check that SHOW works with SELECT grant on whole table
---echo # Connection default
 connection default;
 GRANT SELECT ON mysql.proc TO user2@localhost;
 
---echo # Connection con2
 connection con2;
 --echo # This should work
 SHOW CREATE PROCEDURE db1.p1;
 
---echo # Connection default
 connection default;
 disconnect con2;
 DROP USER user2@localhost;
@@ -1020,7 +988,6 @@ create procedure mysqltest_db.p1() begin end;
 --echo # Create user with no privileges on mysqltest_db database.
 create user bug12602983_user@localhost;
 
---echo # Connect as user 'bug12602983_user@localhost'
 connect (conn1, localhost, bug12602983_user,,);
 
 --echo # Attempt to execute routine on which user doesn't have privileges
@@ -1041,7 +1008,6 @@ create view bug12602983_v1 as select mysqltest_db.f_does_not_exist();
 --error ER_PROCACCESS_DENIED_ERROR
 create view bug12602983_v1 as select mysqltest_db.f1();
 
---echo # Connection 'default'.
 connection default;
 disconnect conn1;
 drop user bug12602983_user@localhost;