diff --git a/mysql-test/main/alter_user.result b/mysql-test/main/alter_user.result index 19e427e8f10..16147a6c7d2 100644 --- a/mysql-test/main/alter_user.result +++ b/mysql-test/main/alter_user.result @@ -34,12 +34,14 @@ select @@global.read_only; ON alter user foo; ERROR HY000: The MariaDB server is running with the --read-only=ON option so it cannot execute this statement +disconnect a; # Grant READ_ONLY ADMIN privilege to the user. connection default; grant READ_ONLY ADMIN on *.* to foo; # We now have READ_ONLY ADMIN privilege. We should be able to run alter user. connect b, localhost, foo; alter user foo; +disconnect b; connection default; SET GLOBAL read_only = @start_read_only; # diff --git a/mysql-test/main/alter_user.test b/mysql-test/main/alter_user.test index 6f4f9fb1e1e..f00016e98c4 100644 --- a/mysql-test/main/alter_user.test +++ b/mysql-test/main/alter_user.test @@ -32,6 +32,7 @@ select @@global.read_only; --error ER_OPTION_PREVENTS_STATEMENT alter user foo; +disconnect a; --echo # Grant READ_ONLY ADMIN privilege to the user. connection default; @@ -40,6 +41,7 @@ grant READ_ONLY ADMIN on *.* to foo; --echo # We now have READ_ONLY ADMIN privilege. We should be able to run alter user. connect (b, localhost, foo); alter user foo; +disconnect b; connection default; SET GLOBAL read_only = @start_read_only; diff --git a/mysql-test/main/create_drop_role.result b/mysql-test/main/create_drop_role.result index e3c893aaacf..ee8243aa4fd 100644 --- a/mysql-test/main/create_drop_role.result +++ b/mysql-test/main/create_drop_role.result @@ -76,6 +76,7 @@ Warnings: Note 1976 Can't drop role 'role_1'; it doesn't exist DROP ROLE role_1; ERROR HY000: Operation DROP ROLE failed for 'role_1' +disconnect user_a; DROP USER u1@localhost; CREATE ROLE r; GRANT SHOW DATABASES ON *.* TO r; diff --git a/mysql-test/main/create_drop_role.test b/mysql-test/main/create_drop_role.test index 808461ed344..e4890851beb 100644 --- a/mysql-test/main/create_drop_role.test +++ b/mysql-test/main/create_drop_role.test @@ -54,6 +54,7 @@ DROP ROLE IF EXISTS role_1; --error ER_CANNOT_USER DROP ROLE role_1; +disconnect user_a; DROP USER u1@localhost; # MDEV-17942 diff --git a/mysql-test/main/create_or_replace_permission.result b/mysql-test/main/create_or_replace_permission.result index 0f6ab9d411b..8888fb04ed4 100644 --- a/mysql-test/main/create_or_replace_permission.result +++ b/mysql-test/main/create_or_replace_permission.result @@ -44,6 +44,7 @@ ERROR 42000: Access denied; you need (at least one of) the CREATE USER privilege CREATE OR REPLACE ROLE developer; ERROR 42000: Access denied; you need (at least one of) the CREATE USER privilege(s) for this operation connection default; +disconnect user_a; SELECT CURRENT_USER; CURRENT_USER root@localhost diff --git a/mysql-test/main/create_or_replace_permission.test b/mysql-test/main/create_or_replace_permission.test index 4200c0e53ee..66cd96bc6fe 100644 --- a/mysql-test/main/create_or_replace_permission.test +++ b/mysql-test/main/create_or_replace_permission.test @@ -61,6 +61,7 @@ CREATE OR REPLACE USER u1@localhost; CREATE OR REPLACE ROLE developer; connection default; +disconnect user_a; SELECT CURRENT_USER; DROP DATABASE db1; DROP USER mysqltest_1@localhost; diff --git a/mysql-test/main/cte_grant.result b/mysql-test/main/cte_grant.result index fef46b94112..c88fca86454 100644 --- a/mysql-test/main/cte_grant.result +++ b/mysql-test/main/cte_grant.result @@ -60,6 +60,7 @@ c d 1 30 1 30 connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; # diff --git a/mysql-test/main/cte_grant.test b/mysql-test/main/cte_grant.test index 30fe94431cb..c9330de7a19 100644 --- a/mysql-test/main/cte_grant.test +++ b/mysql-test/main/cte_grant.test @@ -68,6 +68,7 @@ connection user1; select * from mysqltest.v3; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result index 1ddb0dc0b06..6631ef7fc21 100644 --- a/mysql-test/main/grant.result +++ b/mysql-test/main/grant.result @@ -1294,11 +1294,11 @@ connection bug23556; USE bug23556; TRUNCATE t1; connection default; +disconnect bug23556; USE test; DROP DATABASE bug23556; DROP USER bug23556@localhost; connection default; -disconnect bug23556; connect con1, localhost, root,,*NO-ONE*; connection con1; GRANT PROCESS ON * TO user@localhost; @@ -1777,8 +1777,8 @@ ERROR 42S01: Table 't4' already exists create table t1 select * from t2; ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t1` connection default; -drop user mysqltest@localhost; disconnect user1; +drop user mysqltest@localhost; drop database mysqltest; use test; call mtr.add_suppression("Can't open and lock privilege tables"); diff --git a/mysql-test/main/grant.test b/mysql-test/main/grant.test index 2dc263e1f14..8bcf68f4ef2 100644 --- a/mysql-test/main/grant.test +++ b/mysql-test/main/grant.test @@ -962,11 +962,11 @@ USE bug23556; TRUNCATE t1; connection default; +disconnect bug23556; USE test; DROP DATABASE bug23556; DROP USER bug23556@localhost; connection default; -disconnect bug23556; # @@ -1564,8 +1564,8 @@ create table t4 select * from t2; create table t1 select * from t2; connection default; -drop user mysqltest@localhost; disconnect user1; +drop user mysqltest@localhost; drop database mysqltest; use test; diff --git a/mysql-test/main/grant5.result b/mysql-test/main/grant5.result index b112e152681..7cd404285b8 100644 --- a/mysql-test/main/grant5.result +++ b/mysql-test/main/grant5.result @@ -16,6 +16,7 @@ GRANT USAGE ON *.* TO `foo` show grants for foo@'%'; ERROR 42000: Access denied for user 'test'@'%' to database 'mysql' connection default; +disconnect conn_1; drop user test, foo; drop role foo; CREATE TABLE t1 (a INT); diff --git a/mysql-test/main/grant5.test b/mysql-test/main/grant5.test index c1253c55ac6..3716ff6cc63 100644 --- a/mysql-test/main/grant5.test +++ b/mysql-test/main/grant5.test @@ -20,6 +20,7 @@ show grants for foo; # role --error ER_DBACCESS_DENIED_ERROR show grants for foo@'%'; # user --connection default +--disconnect conn_1 drop user test, foo; drop role foo; diff --git a/mysql-test/main/grant_master_admin.result b/mysql-test/main/grant_master_admin.result index bd08ade940c..7b68551b8ac 100644 --- a/mysql-test/main/grant_master_admin.result +++ b/mysql-test/main/grant_master_admin.result @@ -30,6 +30,7 @@ connection con1; SHOW SLAVE HOSTS; Server_id Host Port Master_id connection default; +disconnect con1; DROP USER user1@localhost; # # End of 10.5 tests diff --git a/mysql-test/main/grant_master_admin.test b/mysql-test/main/grant_master_admin.test index 6957ccfd322..adb64a87012 100644 --- a/mysql-test/main/grant_master_admin.test +++ b/mysql-test/main/grant_master_admin.test @@ -39,6 +39,7 @@ connection con1; SHOW SLAVE HOSTS; connection default; +disconnect con1; DROP USER user1@localhost; --echo # diff --git a/mysql-test/main/information_schema_db.result b/mysql-test/main/information_schema_db.result index 2ce8ba14278..05114d945dc 100644 --- a/mysql-test/main/information_schema_db.result +++ b/mysql-test/main/information_schema_db.result @@ -45,6 +45,7 @@ call mbase.p1(); call mbase.p1(); call mbase.p1(); connection default; +disconnect user1; use `inf%`; drop user mysqltest_1@localhost; drop table t1; @@ -62,7 +63,6 @@ drop function func2; drop database `inf%`; drop procedure mbase.p1; drop database mbase; -disconnect user1; # # Bug#18282 INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views # @@ -245,9 +245,9 @@ testdb_1 v1 show create view testdb_1.v1; ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `testdb_1`.`v1` connection default; +disconnect user1; drop user mysqltest_1@localhost; drop database testdb_1; -disconnect user1; set global sql_mode=default; # # MDEV-20549 SQL SECURITY DEFINER does not work for INFORMATION_SCHEMA tables diff --git a/mysql-test/main/information_schema_db.test b/mysql-test/main/information_schema_db.test index eab7f4f8a8c..56b56d1a029 100644 --- a/mysql-test/main/information_schema_db.test +++ b/mysql-test/main/information_schema_db.test @@ -66,6 +66,7 @@ call mbase.p1(); --enable_result_log connection default; +disconnect user1; use `inf%`; drop user mysqltest_1@localhost; drop table t1; @@ -80,7 +81,6 @@ drop function func2; drop database `inf%`; drop procedure mbase.p1; drop database mbase; -disconnect user1; --echo # --echo # Bug#18282 INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views @@ -237,9 +237,9 @@ where table_name='v1'; show create view testdb_1.v1; connection default; +disconnect user1; drop user mysqltest_1@localhost; drop database testdb_1; -disconnect user1; set global sql_mode=default; diff --git a/mysql-test/main/kill-2.result b/mysql-test/main/kill-2.result index 0f9d069aacc..c16367930d3 100644 --- a/mysql-test/main/kill-2.result +++ b/mysql-test/main/kill-2.result @@ -36,6 +36,8 @@ Id User Host db Command Time State Info Progress kill user b; ERROR HY000: Operation KILL USER failed for b@% connection default; +disconnect a; +disconnect b; drop user a@'127.0.0.1'; drop user b@'127.0.0.1'; # diff --git a/mysql-test/main/kill-2.test b/mysql-test/main/kill-2.test index 9bc4fe03346..69fccaa0c27 100644 --- a/mysql-test/main/kill-2.test +++ b/mysql-test/main/kill-2.test @@ -48,6 +48,8 @@ show processlist; --error ER_KILL_DENIED_ERROR kill user b; --connection default +--disconnect a +--disconnect b drop user a@'127.0.0.1'; drop user b@'127.0.0.1'; diff --git a/mysql-test/main/multi_update.result b/mysql-test/main/multi_update.result index 4ca76a8cbca..50a9fa2ece0 100644 --- a/mysql-test/main/multi_update.result +++ b/mysql-test/main/multi_update.result @@ -954,6 +954,7 @@ select * from t2; log triggered triggered +disconnect a; drop table t1,t2, t3; drop user foo; create table t1 (a int, b int); diff --git a/mysql-test/main/multi_update.test b/mysql-test/main/multi_update.test index 3561ff43375..c00c56bd6e2 100644 --- a/mysql-test/main/multi_update.test +++ b/mysql-test/main/multi_update.test @@ -921,6 +921,7 @@ insert t3 values (2); update t1 left join t3 on t1.id = t3.id set t1.v1 = 'hello'; select * from t2; +disconnect a; drop table t1,t2, t3; drop user foo; diff --git a/mysql-test/main/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result index 076dd71193a..760d6fcca31 100644 --- a/mysql-test/main/mysqlbinlog.result +++ b/mysql-test/main/mysqlbinlog.result @@ -690,6 +690,7 @@ SELECT * FROM t1; a b 1 root@localhost connection default; +disconnect unsecure; DROP DATABASE mysqltest1; DROP USER untrusted@localhost; # Bug#32580 mysqlbinlog cannot read binlog event with user variables diff --git a/mysql-test/main/mysqlbinlog.test b/mysql-test/main/mysqlbinlog.test index a1b9c89fee4..0bc273a6457 100644 --- a/mysql-test/main/mysqlbinlog.test +++ b/mysql-test/main/mysqlbinlog.test @@ -371,6 +371,7 @@ INSERT INTO t1 VALUES (1,USER()); SELECT * FROM t1; connection default; +disconnect unsecure; DROP DATABASE mysqltest1; DROP USER untrusted@localhost; diff --git a/mysql-test/main/opt_trace_security.result b/mysql-test/main/opt_trace_security.result index 798704b281d..2e78f843138 100644 --- a/mysql-test/main/opt_trace_security.result +++ b/mysql-test/main/opt_trace_security.result @@ -434,6 +434,8 @@ query INSUFFICIENT_PRIVILEGES 1 set optimizer_trace='enabled=off'; connection default; +disconnect con_foo; +disconnect con_bar; select current_user(); current_user() root@localhost diff --git a/mysql-test/main/opt_trace_security.test b/mysql-test/main/opt_trace_security.test index 414cd8f437a..f56d2d1120e 100644 --- a/mysql-test/main/opt_trace_security.test +++ b/mysql-test/main/opt_trace_security.test @@ -192,6 +192,8 @@ set optimizer_trace='enabled=off'; --enable_view_protocol connection default; +disconnect con_foo; +disconnect con_bar; select current_user(); select * from db1.v1; drop user foo@localhost, bar@localhost; diff --git a/mysql-test/main/partition_symlink.result b/mysql-test/main/partition_symlink.result index c9dc98ee856..c54425f8864 100644 --- a/mysql-test/main/partition_symlink.result +++ b/mysql-test/main/partition_symlink.result @@ -128,10 +128,10 @@ DATA DIRECTORY 'MYSQLTEST_VARDIR/tmp' Got one of the listed errors connection default; # user root (cleanup): +disconnect con1; DROP DATABASE mysqltest2; USE test; DROP USER mysqltest_1@localhost; -disconnect con1; create table t2 (i int ) ENGINE = MyISAM partition by range (i) diff --git a/mysql-test/main/partition_symlink.test b/mysql-test/main/partition_symlink.test index 5582a62add3..0b79c4f586c 100644 --- a/mysql-test/main/partition_symlink.test +++ b/mysql-test/main/partition_symlink.test @@ -165,10 +165,10 @@ connection con1; ); connection default; -- echo # user root (cleanup): + disconnect con1; DROP DATABASE mysqltest2; USE test; DROP USER mysqltest_1@localhost; - disconnect con1; # # Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with partitioned tables diff --git a/mysql-test/main/ps_show_log.result b/mysql-test/main/ps_show_log.result index 1bd2c2a53e5..bd150356343 100644 --- a/mysql-test/main/ps_show_log.result +++ b/mysql-test/main/ps_show_log.result @@ -61,5 +61,6 @@ ERROR 42000: Access denied; you need (at least one of) the SLAVE MONITOR privile DEALLOCATE PREPARE stmt_1; include/rpl_end.inc connection default; +disconnect con2; DROP USER u1; # End of 10.2 tests diff --git a/mysql-test/main/ps_show_log.test b/mysql-test/main/ps_show_log.test index 3b806fe72e3..51827c66134 100644 --- a/mysql-test/main/ps_show_log.test +++ b/mysql-test/main/ps_show_log.test @@ -67,6 +67,7 @@ DEALLOCATE PREPARE stmt_1; --source include/rpl_end.inc --connection default +--disconnect con2 # Clean up DROP USER u1; diff --git a/mysql-test/main/read_only.result b/mysql-test/main/read_only.result index 79cca3f48a0..6a0a8db830f 100644 --- a/mysql-test/main/read_only.result +++ b/mysql-test/main/read_only.result @@ -331,11 +331,11 @@ ERROR HY000: The MariaDB server is running with the --read-only=NO_LOCK_NO_ADMIN select count(*) from t1,(select a from t1 LOCK IN SHARE MODE) as t2; ERROR HY000: The MariaDB server is running with the --read-only=NO_LOCK_NO_ADMIN option so it cannot execute this statement commit; +disconnect con1; SET GLOBAL read_only=0; select count(*) from t1; count(*) 4 drop table t1; drop user user1; -disconnect con1; # End of 11.8 tests diff --git a/mysql-test/main/read_only.test b/mysql-test/main/read_only.test index f43ddb9d2d3..a9a0402c45b 100644 --- a/mysql-test/main/read_only.test +++ b/mysql-test/main/read_only.test @@ -447,10 +447,10 @@ select count(*) from t1 LOCK IN SHARE MODE; select count(*) from t1,(select a from t1 LOCK IN SHARE MODE) as t2; commit; +disconnect con1; SET GLOBAL read_only=0; select count(*) from t1; drop table t1; drop user user1; -disconnect con1; --echo # End of 11.8 tests diff --git a/mysql-test/main/read_only_innodb.result b/mysql-test/main/read_only_innodb.result index 6616356385d..9d543399d9a 100644 --- a/mysql-test/main/read_only_innodb.result +++ b/mysql-test/main/read_only_innodb.result @@ -19,11 +19,11 @@ a 11733 COMMIT; ERROR HY000: The MariaDB server is running with the --read-only=ON option so it cannot execute this statement +disconnect con1; connection default; set global read_only=0; drop table table_11733 ; drop user test@localhost; -disconnect con1; create user test@localhost; GRANT CREATE, SELECT, DROP, LOCK TABLES ON *.* TO test@localhost; connect con1, localhost, test, , test; @@ -64,12 +64,12 @@ connection default; set global read_only=1; connection con1; unlock tables; +disconnect con1; connection default; SET GLOBAL read_only=0; UNLOCK TABLES; DROP TABLE t1; DROP USER test@localhost; -disconnect con1; # End of 5.1 tests # # Bug#33669: Transactional temporary tables do not work under --read-only diff --git a/mysql-test/main/read_only_innodb.test b/mysql-test/main/read_only_innodb.test index 63f320da6a0..b43488877a0 100644 --- a/mysql-test/main/read_only_innodb.test +++ b/mysql-test/main/read_only_innodb.test @@ -38,12 +38,12 @@ select * from table_11733 ; --error ER_OPTION_PREVENTS_STATEMENT COMMIT; +disconnect con1; connection default; set global read_only=0; drop table table_11733 ; drop user test@localhost; -disconnect con1; # # Bug #35732: read-only blocks SELECT statements in InnoDB # @@ -93,6 +93,7 @@ set global read_only=1; connection con1; unlock tables; +disconnect con1; connection default; SET GLOBAL read_only=0; @@ -100,7 +101,6 @@ UNLOCK TABLES; DROP TABLE t1; DROP USER test@localhost; -disconnect con1; --echo # End of 5.1 tests --echo # diff --git a/mysql-test/main/session_user.result b/mysql-test/main/session_user.result index d2d743e9043..96d9d0b3df1 100644 --- a/mysql-test/main/session_user.result +++ b/mysql-test/main/session_user.result @@ -50,6 +50,7 @@ USER() SESSION_USER() test_user@localhost test_user@localhost # Cleanup connection default; +disconnect test_user_con; DROP USER 'test_user'@'%'; DROP FUNCTION test.func_session_user; DROP VIEW test.view_session_user; diff --git a/mysql-test/main/session_user.test b/mysql-test/main/session_user.test index 877011b02ea..c7262c31fd4 100644 --- a/mysql-test/main/session_user.test +++ b/mysql-test/main/session_user.test @@ -48,6 +48,7 @@ SELECT USER(), SESSION_USER(); --echo # Cleanup --connection default +--disconnect test_user_con DROP USER 'test_user'@'%'; DROP FUNCTION test.func_session_user; DROP VIEW test.view_session_user; diff --git a/mysql-test/main/show_explain.result b/mysql-test/main/show_explain.result index 546db8e279e..58b69262f34 100644 --- a/mysql-test/main/show_explain.result +++ b/mysql-test/main/show_explain.result @@ -1046,8 +1046,8 @@ a 1 2 SET debug_dbug=@old_debug; -drop user test2@localhost; disconnect con2; +drop user test2@localhost; # # Test that it is possible to KILL a SHOW EXPLAIN command that's waiting # on its target thread diff --git a/mysql-test/main/show_explain.test b/mysql-test/main/show_explain.test index d6ac6a77a8e..f728b42f682 100644 --- a/mysql-test/main/show_explain.test +++ b/mysql-test/main/show_explain.test @@ -933,9 +933,9 @@ connection con1; reap; SET debug_dbug=@old_debug; +disconnect con2; drop user test2@localhost; -disconnect con2; --echo # --echo # Test that it is possible to KILL a SHOW EXPLAIN command that's waiting --echo # on its target thread diff --git a/mysql-test/main/sp-security.result b/mysql-test/main/sp-security.result index 1bac9290b11..fcc4c12c51d 100644 --- a/mysql-test/main/sp-security.result +++ b/mysql-test/main/sp-security.result @@ -459,11 +459,11 @@ SHOW CREATE FUNCTION wl2897_f3; Function sql_mode Create Function character_set_client collation_connection Database Collation wl2897_f3 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`a @ b @ c`@`localhost` FUNCTION `wl2897_f3`() RETURNS int(11) RETURN 3 latin1 latin1_swedish_ci utf8mb4_uca1400_ai_ci +disconnect mysqltest_1_con; +disconnect mysqltest_2_con; DROP USER mysqltest_1@localhost; DROP USER mysqltest_2@localhost; DROP DATABASE mysqltest; -disconnect mysqltest_1_con; -disconnect mysqltest_2_con; connection con1root; DROP DATABASE IF EXISTS mysqltest; CREATE DATABASE mysqltest; diff --git a/mysql-test/main/sp-security.test b/mysql-test/main/sp-security.test index 4708a2ca286..d891ad8b91b 100644 --- a/mysql-test/main/sp-security.test +++ b/mysql-test/main/sp-security.test @@ -644,15 +644,13 @@ SHOW CREATE FUNCTION wl2897_f3; # Cleanup. +--disconnect mysqltest_1_con +--disconnect mysqltest_2_con DROP USER mysqltest_1@localhost; DROP USER mysqltest_2@localhost; DROP DATABASE mysqltest; ---disconnect mysqltest_1_con ---disconnect mysqltest_2_con - - # # Bug#13198 SP executes if definer does not exist # diff --git a/mysql-test/main/trigger_notembedded.result b/mysql-test/main/trigger_notembedded.result index 32b8696a7ef..86f46741c61 100644 --- a/mysql-test/main/trigger_notembedded.result +++ b/mysql-test/main/trigger_notembedded.result @@ -168,6 +168,8 @@ def mysqltest_db1 trg3 UPDATE def mysqltest_db1 t1 1 NULL SET @a = 3 ROW BEFORE def mysqltest_db1 trg4 UPDATE def mysqltest_db1 t1 1 NULL SET @a = 4 ROW AFTER NULL NULL OLD NEW # STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION @hostname latin1 latin1_swedish_ci utf8mb4_uca1400_ai_ci def mysqltest_db1 trg5 DELETE def mysqltest_db1 t1 1 NULL SET @a = 5 ROW BEFORE NULL NULL OLD NEW # STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION @abcdef@@@hostname latin1 latin1_swedish_ci utf8mb4_uca1400_ai_ci connection default; +disconnect wl2818_definer_con; +disconnect wl2818_invoker_con; DROP USER mysqltest_dfn@localhost; DROP USER mysqltest_inv@localhost; DROP DATABASE mysqltest_db1; @@ -343,6 +345,7 @@ DELETE FROM t1; SELECT @mysqltest_var; @mysqltest_var Hello, world! +disconnect bug15166_u1_con; DROP USER mysqltest_u1@localhost; DROP DATABASE mysqltest_db1; DELETE FROM mysql.user WHERE User LIKE 'mysqltest_%'; @@ -559,10 +562,10 @@ connection default; REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost; UPDATE IGNORE t1, t2 SET t1.a1 = 2, t2.a1 = 3 WHERE t1.a1 = 1 AND t2.a1 = 2; ERROR 42000: TRIGGER command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t1` -DROP DATABASE mysqltest_db1; -DROP USER mysqltest_u1@localhost; disconnect con1; connection default; +DROP DATABASE mysqltest_db1; +DROP USER mysqltest_u1@localhost; USE test; # End of 5.1 tests. # diff --git a/mysql-test/main/trigger_notembedded.test b/mysql-test/main/trigger_notembedded.test index fa29b2175fc..27f97d263ae 100644 --- a/mysql-test/main/trigger_notembedded.test +++ b/mysql-test/main/trigger_notembedded.test @@ -345,6 +345,8 @@ SELECT * FROM INFORMATION_SCHEMA.TRIGGERS ORDER BY trigger_name; # --connection default +--disconnect wl2818_definer_con +--disconnect wl2818_invoker_con DROP USER mysqltest_dfn@localhost; DROP USER mysqltest_inv@localhost; @@ -634,6 +636,7 @@ SELECT @mysqltest_var; # Cleanup. # +--disconnect bug15166_u1_con DROP USER mysqltest_u1@localhost; DROP DATABASE mysqltest_db1; @@ -967,11 +970,11 @@ REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost; --error ER_TABLEACCESS_DENIED_ERROR UPDATE IGNORE t1, t2 SET t1.a1 = 2, t2.a1 = 3 WHERE t1.a1 = 1 AND t2.a1 = 2; # Cleanup +--disconnect con1 +--connection default DROP DATABASE mysqltest_db1; DROP USER mysqltest_u1@localhost; ---disconnect con1 ---connection default USE test; --echo # End of 5.1 tests. diff --git a/mysql-test/main/user_limits.result b/mysql-test/main/user_limits.result index 0094086045d..d46dcf95b94 100644 --- a/mysql-test/main/user_limits.result +++ b/mysql-test/main/user_limits.result @@ -21,9 +21,9 @@ connection mqph2; select * from t1; ERROR 42000: User 'mysqltest_1' has exceeded the 'max_queries_per_hour' resource (current value: 2) connection default; -drop user mysqltest_1@localhost; disconnect mqph; disconnect mqph2; +drop user mysqltest_1@localhost; create user mysqltest_1@localhost; grant all on test.* to mysqltest_1@localhost with max_updates_per_hour 2; flush user_resources; @@ -48,9 +48,9 @@ ERROR 42000: User 'mysqltest_1' has exceeded the 'max_updates_per_hour' resource select * from t1; i connection default; -drop user mysqltest_1@localhost; disconnect muph; disconnect muph2; +drop user mysqltest_1@localhost; create user mysqltest_1@localhost; grant all on test.* to mysqltest_1@localhost with max_connections_per_hour 2; flush user_resources; diff --git a/mysql-test/main/user_limits.test b/mysql-test/main/user_limits.test index f60077805c1..0399af6a353 100644 --- a/mysql-test/main/user_limits.test +++ b/mysql-test/main/user_limits.test @@ -36,9 +36,9 @@ connection mqph2; select * from t1; # cleanup connection default; -drop user mysqltest_1@localhost; disconnect mqph; disconnect mqph2; +drop user mysqltest_1@localhost; # Test of MAX_UPDATES_PER_HOUR limit create user mysqltest_1@localhost; @@ -61,9 +61,9 @@ delete from t1; select * from t1; # Cleanup connection default; -drop user mysqltest_1@localhost; disconnect muph; disconnect muph2; +drop user mysqltest_1@localhost; # Test of MAX_CONNECTIONS_PER_HOUR limit create user mysqltest_1@localhost; diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index a1c1a2e71a2..27c0e8cc028 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -2900,12 +2900,12 @@ connection root; SELECT * FROM t1; x 1 +disconnect user21261; DROP USER 'user21261'@'localhost'; DROP DATABASE bug21261DB; +disconnect root; connection default; USE test; -disconnect root; -disconnect user21261; set GLOBAL sql_mode=default; set LOCAL sql_mode=default; create table t1 (f1 datetime); diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index 99c248d0374..1e6e35612cf 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -2769,12 +2769,12 @@ connection user21261; UPDATE v1,t2 SET x=1 WHERE x=y; connection root; SELECT * FROM t1; +disconnect user21261; DROP USER 'user21261'@'localhost'; DROP DATABASE bug21261DB; +disconnect root; connection default; USE test; -disconnect root; -disconnect user21261; set GLOBAL sql_mode=default; set LOCAL sql_mode=default; diff --git a/mysql-test/main/view_grant.result b/mysql-test/main/view_grant.result index ffebe4f6399..8ee590c0a2f 100644 --- a/mysql-test/main/view_grant.result +++ b/mysql-test/main/view_grant.result @@ -55,6 +55,7 @@ c select d from mysqltest.v1; ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'd' in table 'v1' connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; create database mysqltest; @@ -62,7 +63,7 @@ create table mysqltest.t1 (a int, b int); create algorithm=temptable view mysqltest.v1 (c,d) as select a+1,b+1 from mysqltest.t1; create user mysqltest_1@localhost; grant select (c) on mysqltest.v1 to mysqltest_1@localhost; -connection user1; +connect user1,localhost,mysqltest_1,,mysqltest; select c from mysqltest.v1; c select d from mysqltest.v1; @@ -189,9 +190,9 @@ show create view mysqltest.v4; View Create View character_set_client collation_connection v4 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `t2`.`a` + 1 AS `c`,`t2`.`b` + 1 AS `d` from `t2` latin1 latin1_swedish_ci connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; create database mysqltest; create table mysqltest.t1 (a int, b int, primary key(a)); insert into mysqltest.t1 values (10,2), (20,3), (30,4), (40,5), (50,10); @@ -250,9 +251,9 @@ ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table ` update v3 set a=a+c; ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3` connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; create database mysqltest; create table mysqltest.t1 (a int, b int, primary key(a)); insert into mysqltest.t1 values (1,2), (2,3), (3,4), (4,5), (5,10); @@ -314,9 +315,9 @@ ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table ` insert into v2 select x,y from t2; ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2` connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; connection root; create database mysqltest; create table mysqltest.t1 (a int, b int); @@ -355,10 +356,10 @@ grant update,select(b) on mysqltest.t2 to mysqltest_1@localhost; connection user1; create view v4 as select b+1 from mysqltest.t2; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; drop view v1,v2,v4; -disconnect user1; create database mysqltest; create table mysqltest.t1 (a int); create user mysqltest_1@localhost; @@ -366,9 +367,9 @@ grant all privileges on mysqltest.* to mysqltest_1@localhost; connect user1,localhost,mysqltest_1,,mysqltest; create view v1 as select * from t1; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; create database mysqltest; create table mysqltest.t1 (a int, b int); create user mysqltest_1@localhost; @@ -386,10 +387,10 @@ ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function grant select on mysqltest.t1 to mysqltest_1@localhost; select * from v1; a b +disconnect user1; drop user mysqltest_1@localhost; drop view v1; drop database mysqltest; -disconnect user1; create database mysqltest; use mysqltest; create table t1 (a int); @@ -422,10 +423,10 @@ ERROR HY000: View 'mysqltest.v4' references invalid table(s) or column(s) or fun select * from v5; ERROR HY000: View 'mysqltest.v5' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; use test; -disconnect user1; create database mysqltest; use mysqltest; create table t1 (a int); @@ -457,9 +458,9 @@ f2() NULL select * from v5; ERROR HY000: View 'mysqltest.v5' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; use test; create database mysqltest; use mysqltest; @@ -491,9 +492,9 @@ a b 1 1 select * from v5; ERROR HY000: View 'mysqltest.v5' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; create database mysqltest; use mysqltest; create table t1 (a int); @@ -523,10 +524,10 @@ ERROR HY000: View 'mysqltest.v4' references invalid table(s) or column(s) or fun select * from v5; ERROR HY000: View 'mysqltest.v5' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; use test; -disconnect user1; create user 'test14256'@'%'; grant all on test.* to 'test14256'@'%'; connect test14256,localhost,test14256,,test; @@ -567,10 +568,10 @@ SHOW CREATE TABLE v1; ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1` UNLOCK TABLES; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; use test; -disconnect user1; disconnect root; connection default; create definer=some_user@`` sql security invoker view v1 as select 1; @@ -888,9 +889,9 @@ connection root; SHOW CREATE VIEW v3; View Create View character_set_client collation_connection v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci +disconnect u1; DROP USER u26813@localhost; DROP DATABASE db26813; -disconnect u1; # # Bug#29908 A user can gain additional access through the ALTER VIEW. # @@ -935,11 +936,11 @@ ALTER VIEW v2 AS SELECT f1 FROM t1; SHOW CREATE VIEW v2; View Create View character_set_client collation_connection v2 CREATE ALGORITHM=UNDEFINED DEFINER=`u29908_1`@`localhost` SQL SECURITY INVOKER VIEW `v2` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci +disconnect u1; +disconnect u2; DROP USER u29908_1@localhost; DROP USER u29908_2@localhost; DROP DATABASE mysqltest_29908; -disconnect u1; -disconnect u2; ####################################################################### CREATE DATABASE mysqltest1; CREATE DATABASE mysqltest2; diff --git a/mysql-test/main/view_grant.test b/mysql-test/main/view_grant.test index 0e220b77b04..1d08b2b7569 100644 --- a/mysql-test/main/view_grant.test +++ b/mysql-test/main/view_grant.test @@ -78,6 +78,7 @@ select c from mysqltest.v1; select d from mysqltest.v1; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; @@ -88,7 +89,7 @@ create algorithm=temptable view mysqltest.v1 (c,d) as select a+1,b+1 from mysqlt create user mysqltest_1@localhost; grant select (c) on mysqltest.v1 to mysqltest_1@localhost; -connection user1; +connect (user1,localhost,mysqltest_1,,mysqltest); select c from mysqltest.v1; # there are no privileges on column 'd' --error ER_COLUMNACCESS_DENIED_ERROR @@ -211,9 +212,9 @@ explain select c from mysqltest.v4; show create view mysqltest.v4; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; # # UPDATE privileges on VIEW columns and whole VIEW @@ -260,9 +261,9 @@ update t2,v3 set v3.a=v3.a+v3.c where t2.x=v3.c; update v3 set a=a+c; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; # # DELETE privileges on VIEW @@ -326,9 +327,9 @@ insert into v2 values (5,6); insert into v2 select x,y from t2; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; # # test of CREATE VIEW privileges if we have limited privileges @@ -386,10 +387,10 @@ connection user1; create view v4 as select b+1 from mysqltest.t2; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; drop view v1,v2,v4; -disconnect user1; # # user with global DB privileges @@ -403,9 +404,9 @@ connect (user1,localhost,mysqltest_1,,mysqltest); create view v1 as select * from t1; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; # # view definer grants revoking @@ -430,10 +431,10 @@ select * from v1; grant select on mysqltest.t1 to mysqltest_1@localhost; select * from v1; +disconnect user1; drop user mysqltest_1@localhost; drop view v1; drop database mysqltest; -disconnect user1; # # rights on execution of view underlying functions (Bug#9505) @@ -473,10 +474,10 @@ select * from v4; select * from v5; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; use test; -disconnect user1; # # revertion of previous test, definer of view lost his/her rights to execute @@ -518,10 +519,10 @@ select * from v4; --error ER_VIEW_INVALID select * from v5; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; use test; -disconnect user1; # # definer/invoker rights for columns @@ -556,9 +557,9 @@ select * from v4; --error ER_VIEW_INVALID select * from v5; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; create database mysqltest; @@ -588,10 +589,10 @@ select * from v4; select * from v5; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; use test; -disconnect user1; # # Bug#14256 definer in view definition is not fully qualified @@ -650,6 +651,7 @@ SHOW CREATE TABLE v1; UNLOCK TABLES; connection root; +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; use test; @@ -657,7 +659,6 @@ use test; # # switch to default connection # -disconnect user1; disconnect root; connection default; @@ -1022,9 +1023,9 @@ ALTER VIEW v3 AS SELECT f2 FROM t1; connection root; SHOW CREATE VIEW v3; +disconnect u1; DROP USER u26813@localhost; DROP DATABASE db26813; -disconnect u1; --echo # --echo # Bug#29908 A user can gain additional access through the ALTER VIEW. @@ -1064,11 +1065,11 @@ SHOW CREATE VIEW v1; ALTER VIEW v2 AS SELECT f1 FROM t1; SHOW CREATE VIEW v2; +disconnect u1; +disconnect u2; DROP USER u29908_1@localhost; DROP USER u29908_2@localhost; DROP DATABASE mysqltest_29908; -disconnect u1; -disconnect u2; --echo ####################################################################### # diff --git a/mysql-test/suite/binlog/r/binlog_grant.result b/mysql-test/suite/binlog/r/binlog_grant.result index 332adabaaa0..cca29f2f7aa 100644 --- a/mysql-test/suite/binlog/r/binlog_grant.result +++ b/mysql-test/suite/binlog/r/binlog_grant.result @@ -142,6 +142,7 @@ connection user1; connection default; include/diff_tables.inc [t1,t2] # Test cleanup +disconnect user1; DROP TABLE t2,t1; DROP USER user1@localhost; # diff --git a/mysql-test/suite/binlog/t/binlog_grant.test b/mysql-test/suite/binlog/t/binlog_grant.test index d13174eaebc..5a46c7b3168 100644 --- a/mysql-test/suite/binlog/t/binlog_grant.test +++ b/mysql-test/suite/binlog/t/binlog_grant.test @@ -193,6 +193,7 @@ call mtr.add_suppression("Access denied; you need (at least one of) the BINLOG R --echo # Test cleanup --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql +--disconnect user1 DROP TABLE t2,t1; DROP USER user1@localhost; diff --git a/mysql-test/suite/engines/funcs/r/rpl_row_USER.result b/mysql-test/suite/engines/funcs/r/rpl_row_USER.result index 260681c716a..514a3b9bdd9 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_USER.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_USER.result @@ -34,6 +34,7 @@ a users 3 tester@localhost 4 @localhost% connection master; +disconnect m_1; DROP DATABASE mysqltest1; REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; REVOKE ALL ON mysqltest1.* FROM ''@'localhost%'; diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result index 1bbfcedd3ff..08825f8ba50 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_sp.result +++ b/mysql-test/suite/engines/funcs/r/rpl_sp.result @@ -336,6 +336,7 @@ a connection master; drop procedure foo; connection slave; +disconnect con1; connection master; drop function fn1; drop database mysqltest1; diff --git a/mysql-test/suite/engines/funcs/r/rpl_temporary.result b/mysql-test/suite/engines/funcs/r/rpl_temporary.result index 2b381b81d75..34d93df1164 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_temporary.result +++ b/mysql-test/suite/engines/funcs/r/rpl_temporary.result @@ -85,6 +85,7 @@ select * from t2 ORDER BY f; f 5 7 +disconnect con3; drop table t1, t2; drop user zedjzlcsjhd@localhost; use test; diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result index 281e4e8d0f6..fea3772cea0 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result @@ -489,6 +489,8 @@ delete from tb3 where f121='Test 3.5.7.15/16'; Testcase 3.5.7.17 (see Testcase 3.5.1.1) ---------------------------------------- connection default; +disconnect con1_general; +disconnect con1_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result index 52820d6b0cd..6d0a48f7ab6 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result @@ -535,6 +535,8 @@ Rollback; END// ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger connection default; +disconnect con2_general; +disconnect con2_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/funcs_1/r/is_check_constraints.result b/mysql-test/suite/funcs_1/r/is_check_constraints.result index 82a8007e68d..24d8d30bde3 100644 --- a/mysql-test/suite/funcs_1/r/is_check_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_check_constraints.result @@ -147,6 +147,7 @@ a 2 SELECT * FROM information_schema.check_constraints; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA TABLE_NAME CONSTRAINT_NAME LEVEL CHECK_CLAUSE +disconnect con1; connection default; DROP USER foo; DROP DATABASE db; diff --git a/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result b/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result index bb7441d79a0..5c146cfcba1 100644 --- a/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result +++ b/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result @@ -31,5 +31,6 @@ Database (mysql) SHOW DATABASES LIKE 'test'; Database (test) connection default; +disconnect testuser1; DROP USER 'testuser1'@'localhost'; DROP DATABASE db_datadict; diff --git a/mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result b/mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result index 774b65b03bc..d12a5474a75 100644 --- a/mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result +++ b/mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result @@ -32,5 +32,6 @@ Database (mysql) SHOW DATABASES LIKE 'test'; Database (test) connection default; +disconnect testuser1; DROP USER 'testuser1'@'localhost'; DROP DATABASE db_datadict; diff --git a/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result b/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result index 8a99e9e414a..290ef7243ca 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result +++ b/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result @@ -36,5 +36,6 @@ Database (mysql) SHOW DATABASES LIKE 'test'; Database (test) connection default; +disconnect testuser1; DROP USER 'testuser1'@'localhost'; DROP DATABASE db_datadict; diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result index c9a15b46aba..ba99936f877 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_0407.result @@ -489,6 +489,8 @@ delete from tb3 where f121='Test 3.5.7.15/16'; Testcase 3.5.7.17 (see Testcase 3.5.1.1) ---------------------------------------- connection default; +disconnect con1_general; +disconnect con1_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result index c37266bb40c..ade64277cd0 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_08.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result @@ -535,6 +535,8 @@ Rollback; END// ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger connection default; +disconnect con2_general; +disconnect con2_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result index c9a15b46aba..ba99936f877 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result @@ -489,6 +489,8 @@ delete from tb3 where f121='Test 3.5.7.15/16'; Testcase 3.5.7.17 (see Testcase 3.5.1.1) ---------------------------------------- connection default; +disconnect con1_general; +disconnect con1_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result index c37266bb40c..ade64277cd0 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result @@ -535,6 +535,8 @@ Rollback; END// ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger connection default; +disconnect con2_general; +disconnect con2_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/funcs_1/t/is_check_constraints.test b/mysql-test/suite/funcs_1/t/is_check_constraints.test index 1e54e083fb3..d0c007c0bc7 100644 --- a/mysql-test/suite/funcs_1/t/is_check_constraints.test +++ b/mysql-test/suite/funcs_1/t/is_check_constraints.test @@ -114,6 +114,7 @@ SELECT a FROM t1; --sorted_result SELECT * FROM information_schema.check_constraints; +disconnect con1; --connection default DROP USER foo; diff --git a/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test b/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test index bcbbff7276e..2cce497a8af 100644 --- a/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test +++ b/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test @@ -51,5 +51,6 @@ eval $my_show3; # Cleanup connection default; +disconnect testuser1; DROP USER 'testuser1'@'localhost'; DROP DATABASE db_datadict; diff --git a/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test b/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test index f1e0d571057..c96863ea17b 100644 --- a/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test +++ b/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test @@ -54,5 +54,6 @@ eval $my_show3; # Cleanup connection default; +disconnect testuser1; DROP USER 'testuser1'@'localhost'; DROP DATABASE db_datadict; diff --git a/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test b/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test index 76c0b4974d5..e86247cbdd5 100644 --- a/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test +++ b/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test @@ -55,5 +55,6 @@ eval $my_show3; # Cleanup connection default; +disconnect testuser1; DROP USER 'testuser1'@'localhost'; DROP DATABASE db_datadict; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc index 81281156150..abce85c2d0d 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc @@ -604,6 +604,8 @@ let $message= Testcase 3.5.7.17 (see Testcase 3.5.1.1); # Cleanup section 3.5 connection default; + disconnect con1_general; + disconnect con1_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc index f982f93239e..938067bad5c 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc @@ -559,6 +559,8 @@ let $message= Testcase 3.5.8.7; # Cleanup section 3.5 connection default; + disconnect con2_general; + disconnect con2_super; drop user test_general@localhost; drop user test_general; drop user test_super@localhost; diff --git a/mysql-test/suite/innodb/r/information_schema_grants.result b/mysql-test/suite/innodb/r/information_schema_grants.result index a468081db20..bfa266d9773 100644 --- a/mysql-test/suite/innodb/r/information_schema_grants.result +++ b/mysql-test/suite/innodb/r/information_schema_grants.result @@ -263,6 +263,7 @@ select count(*) > -1 from d_trx; count(*) > -1 1 connection default; +disconnect select_only; SET GLOBAL innodb_max_purge_lag_wait=0; drop database test; create database test; diff --git a/mysql-test/suite/innodb/t/information_schema_grants.test b/mysql-test/suite/innodb/t/information_schema_grants.test index d0b2d2db962..72d4dbdb15f 100644 --- a/mysql-test/suite/innodb/t/information_schema_grants.test +++ b/mysql-test/suite/innodb/t/information_schema_grants.test @@ -270,6 +270,7 @@ select count(*) > -1 from i_trx; select count(*) > -1 from d_trx; connection default; +disconnect select_only; # Starting with MariaDB 10.6, ensure that DDL recovery will have completed. SET GLOBAL innodb_max_purge_lag_wait=0; drop database test; diff --git a/mysql-test/suite/perfschema/r/threads_history.result b/mysql-test/suite/perfschema/r/threads_history.result index b5d675adbc6..26930aa3f64 100644 --- a/mysql-test/suite/perfschema/r/threads_history.result +++ b/mysql-test/suite/perfschema/r/threads_history.result @@ -951,6 +951,10 @@ where THREAD_ID = $con4_thread_id; count(*) 0 connection default; +disconnect con1; +disconnect con2; +disconnect con3; +disconnect con4; drop user user1@localhost; drop user user2@localhost; drop user user3@localhost; diff --git a/mysql-test/suite/perfschema/t/threads_history.test b/mysql-test/suite/perfschema/t/threads_history.test index ddfc9edad50..829f69fe59c 100644 --- a/mysql-test/suite/perfschema/t/threads_history.test +++ b/mysql-test/suite/perfschema/t/threads_history.test @@ -649,6 +649,10 @@ evalp select /*4-3*/ count(*) from performance_schema.events_waits_history_long where THREAD_ID = $con4_thread_id; --connection default +--disconnect con1 +--disconnect con2 +--disconnect con3 +--disconnect con4 drop user user1@localhost; drop user user2@localhost; diff --git a/mysql-test/suite/plugins/r/auth_v0100.result b/mysql-test/suite/plugins/r/auth_v0100.result index da3cce7440e..c8d54f0c324 100644 --- a/mysql-test/suite/plugins/r/auth_v0100.result +++ b/mysql-test/suite/plugins/r/auth_v0100.result @@ -17,6 +17,7 @@ user() tt@localhost current_user() zzzzzzzzzzzzzzzz@% @@external_user oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo. connection default; +disconnect c1; drop user tt; drop user zzzzzzzzzzzzzzzz; uninstall plugin auth_0x0100; diff --git a/mysql-test/suite/plugins/r/qc_info_priv.result b/mysql-test/suite/plugins/r/qc_info_priv.result index ea866d51030..94d4f359238 100644 --- a/mysql-test/suite/plugins/r/qc_info_priv.result +++ b/mysql-test/suite/plugins/r/qc_info_priv.result @@ -43,6 +43,7 @@ select count(*) from information_schema.query_cache_info; count(*) 0 connection default; +disconnect conn1; drop user mysqltest; drop table t1; set @@global.query_cache_size=@save_query_cache_size; diff --git a/mysql-test/suite/plugins/t/auth_v0100.test b/mysql-test/suite/plugins/t/auth_v0100.test index 5d0f6f40be9..09c3143d469 100644 --- a/mysql-test/suite/plugins/t/auth_v0100.test +++ b/mysql-test/suite/plugins/t/auth_v0100.test @@ -23,6 +23,7 @@ connection c1; --query_vertical select user(), current_user(), @@external_user connection default; +disconnect c1; drop user tt; drop user zzzzzzzzzzzzzzzz; uninstall plugin auth_0x0100; diff --git a/mysql-test/suite/plugins/t/qc_info_priv.test b/mysql-test/suite/plugins/t/qc_info_priv.test index f5052702768..db212fbffa5 100644 --- a/mysql-test/suite/plugins/t/qc_info_priv.test +++ b/mysql-test/suite/plugins/t/qc_info_priv.test @@ -10,6 +10,7 @@ connection conn1; select a from t1; select count(*) from information_schema.query_cache_info; connection default; +disconnect conn1; drop user mysqltest; drop table t1; diff --git a/mysql-test/suite/roles/admin.result b/mysql-test/suite/roles/admin.result index f305348440d..e6bab03f337 100644 --- a/mysql-test/suite/roles/admin.result +++ b/mysql-test/suite/roles/admin.result @@ -152,4 +152,5 @@ revoke role2 from current_user; revoke role4 from current_user; grant role4 to current_user; drop role role1, role2, role3, role4, role5, role6; +disconnect c1; drop user foo@localhost; diff --git a/mysql-test/suite/roles/admin.test b/mysql-test/suite/roles/admin.test index 23737364201..a4f068aa785 100644 --- a/mysql-test/suite/roles/admin.test +++ b/mysql-test/suite/roles/admin.test @@ -99,4 +99,5 @@ grant role4 to current_user; # cleanup ######################################## drop role role1, role2, role3, role4, role5, role6; +disconnect c1; drop user foo@localhost; diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result index 5b62eba99b1..5c7d86c1a1e 100644 --- a/mysql-test/suite/roles/definer.result +++ b/mysql-test/suite/roles/definer.result @@ -747,6 +747,9 @@ drop role r1; drop role r2; drop role r3; drop role user_like_role; +disconnect foo; +disconnect user1; +disconnect user_like_role; drop user user1; drop user foo; drop user user_like_role; diff --git a/mysql-test/suite/roles/definer.test b/mysql-test/suite/roles/definer.test index b051ea019b3..7a473e1cf1e 100644 --- a/mysql-test/suite/roles/definer.test +++ b/mysql-test/suite/roles/definer.test @@ -459,6 +459,9 @@ drop role r1; drop role r2; drop role r3; drop role user_like_role; +disconnect foo; +disconnect user1; +disconnect user_like_role; drop user user1; drop user foo; drop user user_like_role; diff --git a/mysql-test/suite/roles/drop_routines.result b/mysql-test/suite/roles/drop_routines.result index 7facb9fd1c9..7f8f0ce6dfa 100644 --- a/mysql-test/suite/roles/drop_routines.result +++ b/mysql-test/suite/roles/drop_routines.result @@ -76,6 +76,7 @@ set role r1; select mysql.test_func("r1"); ERROR 42000: execute command denied to user 'u1'@'%' for routine 'mysql.test_func' connection default; +disconnect u1; drop function mysql.test_func; drop role r1, r2, r3; drop user u1; diff --git a/mysql-test/suite/roles/drop_routines.test b/mysql-test/suite/roles/drop_routines.test index 641081af4f2..50bf0e2cd18 100644 --- a/mysql-test/suite/roles/drop_routines.test +++ b/mysql-test/suite/roles/drop_routines.test @@ -63,6 +63,7 @@ set role r1; select mysql.test_func("r1"); connection default; +disconnect u1; drop function mysql.test_func; drop role r1, r2, r3; drop user u1; diff --git a/mysql-test/suite/roles/flush_roles-12366.result b/mysql-test/suite/roles/flush_roles-12366.result index 4af3343bdf4..04cab7a6745 100644 --- a/mysql-test/suite/roles/flush_roles-12366.result +++ b/mysql-test/suite/roles/flush_roles-12366.result @@ -479,6 +479,9 @@ SELECT COUNT(1) FROM oms_live_th.d; COUNT(1) 0 connection default; +disconnect con1; +disconnect con2; +disconnect con3; DROP DATABASE bob_live_sg; DROP DATABASE oms_live_sg; DROP DATABASE bob_live_ph; diff --git a/mysql-test/suite/roles/flush_roles-12366.test b/mysql-test/suite/roles/flush_roles-12366.test index 6a130859dae..d096a6933ce 100644 --- a/mysql-test/suite/roles/flush_roles-12366.test +++ b/mysql-test/suite/roles/flush_roles-12366.test @@ -316,6 +316,10 @@ SELECT COUNT(1) FROM oms_live_th.b; SELECT COUNT(1) FROM oms_live_th.c; SELECT COUNT(1) FROM oms_live_th.d; +connection default; +disconnect con1; +disconnect con2; +disconnect con3; DROP DATABASE bob_live_sg; DROP DATABASE oms_live_sg; diff --git a/mysql-test/suite/roles/grant-5771.result b/mysql-test/suite/roles/grant-5771.result index 14e033f4c29..a9d8905b588 100644 --- a/mysql-test/suite/roles/grant-5771.result +++ b/mysql-test/suite/roles/grant-5771.result @@ -29,6 +29,7 @@ GRANT ALL PRIVILEGES ON `mysqltest2`.* TO `r2` GRANT USAGE ON *.* TO `r1` GRANT ALL PRIVILEGES ON `mysqltest1`.* TO `r1` connection default; +disconnect foo; drop user foo@localhost; drop role r1; drop role r2; diff --git a/mysql-test/suite/roles/grant-5771.test b/mysql-test/suite/roles/grant-5771.test index 3c8f5d2f7c0..00e0c721a68 100644 --- a/mysql-test/suite/roles/grant-5771.test +++ b/mysql-test/suite/roles/grant-5771.test @@ -25,6 +25,7 @@ show tables in mysqltest2; show grants; connection default; +disconnect foo; drop user foo@localhost; drop role r1; drop role r2; diff --git a/mysql-test/suite/roles/grant_empty.result b/mysql-test/suite/roles/grant_empty.result index 2e4542993ba..e80ce02dd9a 100644 --- a/mysql-test/suite/roles/grant_empty.result +++ b/mysql-test/suite/roles/grant_empty.result @@ -12,5 +12,6 @@ Grants for @localhost GRANT `r1` TO ``@`localhost` GRANT USAGE ON *.* TO ``@`localhost` connection default; +disconnect con1; drop role r1; drop user ''@localhost; diff --git a/mysql-test/suite/roles/grant_empty.test b/mysql-test/suite/roles/grant_empty.test index 591a72ea62f..b7f774396ae 100644 --- a/mysql-test/suite/roles/grant_empty.test +++ b/mysql-test/suite/roles/grant_empty.test @@ -18,5 +18,6 @@ select current_user; show grants; connection default; +disconnect con1; drop role r1; drop user ''@localhost; diff --git a/mysql-test/suite/roles/grant_role_auto_create_user.result b/mysql-test/suite/roles/grant_role_auto_create_user.result index 61ce0359c0d..92c50944c7a 100644 --- a/mysql-test/suite/roles/grant_role_auto_create_user.result +++ b/mysql-test/suite/roles/grant_role_auto_create_user.result @@ -76,6 +76,7 @@ ERROR 28000: Can't find any matching row in the user table grant auto_create to foo2@localhost identified by 'pass'; ERROR 42000: You are not allowed to create a user with GRANT connection default; +disconnect con1; drop user foo@localhost; drop user bar@localhost; drop role auto_create; diff --git a/mysql-test/suite/roles/grant_role_auto_create_user.test b/mysql-test/suite/roles/grant_role_auto_create_user.test index e673934775e..5c8226ffa4b 100644 --- a/mysql-test/suite/roles/grant_role_auto_create_user.test +++ b/mysql-test/suite/roles/grant_role_auto_create_user.test @@ -116,6 +116,7 @@ grant auto_create to foo2@localhost identified by 'pass'; --connection default +--disconnect con1 drop user foo@localhost; drop user bar@localhost; drop role auto_create; diff --git a/mysql-test/suite/roles/ip-6401.result b/mysql-test/suite/roles/ip-6401.result index 723916f9211..65dccb44bda 100644 --- a/mysql-test/suite/roles/ip-6401.result +++ b/mysql-test/suite/roles/ip-6401.result @@ -11,5 +11,6 @@ select * from information_schema.enabled_roles; ROLE_NAME r1 connection default; +disconnect con1; drop user foo@'127.0.0.1'; drop role r1; diff --git a/mysql-test/suite/roles/ip-6401.test b/mysql-test/suite/roles/ip-6401.test index b7d4b168b75..1906206f465 100644 --- a/mysql-test/suite/roles/ip-6401.test +++ b/mysql-test/suite/roles/ip-6401.test @@ -12,5 +12,6 @@ set role r1; select * from information_schema.enabled_roles; connection default; +disconnect con1; drop user foo@'127.0.0.1'; drop role r1; diff --git a/mysql-test/suite/roles/recursive.inc b/mysql-test/suite/roles/recursive.inc index 7642f2d69bf..bbd25542145 100644 --- a/mysql-test/suite/roles/recursive.inc +++ b/mysql-test/suite/roles/recursive.inc @@ -245,6 +245,7 @@ show status like 'debug%'; # connection default; +disconnect foo; drop user foo@localhost; drop role role1; drop role role2; diff --git a/mysql-test/suite/roles/recursive.result b/mysql-test/suite/roles/recursive.result index 0706b0a57bd..328fd6563cb 100644 --- a/mysql-test/suite/roles/recursive.result +++ b/mysql-test/suite/roles/recursive.result @@ -353,6 +353,7 @@ revoke select on test.* from role1; show status like 'debug%'; Variable_name Value connection default; +disconnect foo; drop user foo@localhost; drop role role1; drop role role2; diff --git a/mysql-test/suite/roles/recursive_dbug.result b/mysql-test/suite/roles/recursive_dbug.result index f6abc406018..b4e7292dfb3 100644 --- a/mysql-test/suite/roles/recursive_dbug.result +++ b/mysql-test/suite/roles/recursive_dbug.result @@ -472,6 +472,7 @@ Debug_role_merges_table 67 Debug_role_merges_column 30 Debug_role_merges_routine 28 connection default; +disconnect foo; drop user foo@localhost; drop role role1; drop role role2; diff --git a/mysql-test/suite/roles/role_case_sensitive-10744.result b/mysql-test/suite/roles/role_case_sensitive-10744.result index ba30af29e49..8723286446a 100644 --- a/mysql-test/suite/roles/role_case_sensitive-10744.result +++ b/mysql-test/suite/roles/role_case_sensitive-10744.result @@ -54,6 +54,7 @@ Some Secret P4ssw0rd insert into secret_db.t1 values ("|_33T|-|4><"); ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `secret_db`.`t1` connection default; +disconnect test_user; drop role test_ROLE; drop role test_role; drop user test_user; diff --git a/mysql-test/suite/roles/role_case_sensitive-10744.test b/mysql-test/suite/roles/role_case_sensitive-10744.test index fa904949af9..cd5b95dd1aa 100644 --- a/mysql-test/suite/roles/role_case_sensitive-10744.test +++ b/mysql-test/suite/roles/role_case_sensitive-10744.test @@ -46,6 +46,7 @@ select * from secret_db.t1 order by secret; insert into secret_db.t1 values ("|_33T|-|4><"); connection default; +disconnect test_user; drop role test_ROLE; drop role test_role; diff --git a/mysql-test/suite/roles/set_role-13655.result b/mysql-test/suite/roles/set_role-13655.result index f1517fd00d3..36ed93aa02d 100644 --- a/mysql-test/suite/roles/set_role-13655.result +++ b/mysql-test/suite/roles/set_role-13655.result @@ -47,6 +47,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE, LOCK TABLES, EXECUTE ON `t`.* TO `simple` create database t; drop database t; connection default; +disconnect foo; drop role simple; drop role admin; drop user foo; diff --git a/mysql-test/suite/roles/set_role-13655.test b/mysql-test/suite/roles/set_role-13655.test index 6e508c567d9..cf627920dfe 100644 --- a/mysql-test/suite/roles/set_role-13655.test +++ b/mysql-test/suite/roles/set_role-13655.test @@ -43,6 +43,7 @@ create database t; drop database t; connection default; +disconnect foo; drop role simple; drop role admin; drop user foo; diff --git a/mysql-test/suite/roles/set_role-9614.result b/mysql-test/suite/roles/set_role-9614.result index d4d689b87e4..4a5bd313006 100644 --- a/mysql-test/suite/roles/set_role-9614.result +++ b/mysql-test/suite/roles/set_role-9614.result @@ -90,6 +90,8 @@ use bug_db; # Cleanup # connection default; +disconnect john; +disconnect usertestjohn; drop user john; drop user usertestjohn; drop role client; diff --git a/mysql-test/suite/roles/set_role-9614.test b/mysql-test/suite/roles/set_role-9614.test index 91591d38eb2..a2b03a7ba31 100644 --- a/mysql-test/suite/roles/set_role-9614.test +++ b/mysql-test/suite/roles/set_role-9614.test @@ -71,6 +71,8 @@ use bug_db; --echo # Cleanup --echo # connection default; +disconnect john; +disconnect usertestjohn; drop user john; drop user usertestjohn; drop role client; diff --git a/mysql-test/suite/roles/set_role-simple.result b/mysql-test/suite/roles/set_role-simple.result index bf3d338d6b0..c56fff6a128 100644 --- a/mysql-test/suite/roles/set_role-simple.result +++ b/mysql-test/suite/roles/set_role-simple.result @@ -58,4 +58,5 @@ Grants for user1@% GRANT USAGE ON *.* TO `user1`@`%` set role none; connection default; +disconnect con1; drop user user1; diff --git a/mysql-test/suite/roles/set_role-simple.test b/mysql-test/suite/roles/set_role-simple.test index ed884fa2407..6540a4e3d24 100644 --- a/mysql-test/suite/roles/set_role-simple.test +++ b/mysql-test/suite/roles/set_role-simple.test @@ -50,5 +50,6 @@ show grants; set role none; connection default; +disconnect con1; drop user user1; diff --git a/mysql-test/suite/roles/show_create_database-10463.result b/mysql-test/suite/roles/show_create_database-10463.result index efc4fc86fb2..9e23e9226d7 100644 --- a/mysql-test/suite/roles/show_create_database-10463.result +++ b/mysql-test/suite/roles/show_create_database-10463.result @@ -58,6 +58,8 @@ table_schema table_name db t1 db t2 connection default; +disconnect con1; +disconnect con2; drop database db; drop role r1; drop user beep; diff --git a/mysql-test/suite/roles/show_create_database-10463.test b/mysql-test/suite/roles/show_create_database-10463.test index 547f9dd96cd..fb8a7d13daa 100644 --- a/mysql-test/suite/roles/show_create_database-10463.test +++ b/mysql-test/suite/roles/show_create_database-10463.test @@ -48,6 +48,8 @@ where table_schema = 'db' order by table_name; connection default; +disconnect con1; +disconnect con2; drop database db; drop role r1; drop user beep; diff --git a/mysql-test/suite/rpl/r/rpl_read_only.result b/mysql-test/suite/rpl/r/rpl_read_only.result index 6cf12b7def1..59087babf65 100644 --- a/mysql-test/suite/rpl/r/rpl_read_only.result +++ b/mysql-test/suite/rpl/r/rpl_read_only.result @@ -160,6 +160,8 @@ xa rollback '1'; ERROR HY000: The MariaDB server is running with the --read-only=ON option so it cannot execute this statement connection master; xa rollback '1'; +disconnect master2; +disconnect slave2; connection master; drop user test; drop table t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_USER.result b/mysql-test/suite/rpl/r/rpl_row_USER.result index 260681c716a..514a3b9bdd9 100644 --- a/mysql-test/suite/rpl/r/rpl_row_USER.result +++ b/mysql-test/suite/rpl/r/rpl_row_USER.result @@ -34,6 +34,7 @@ a users 3 tester@localhost 4 @localhost% connection master; +disconnect m_1; DROP DATABASE mysqltest1; REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; REVOKE ALL ON mysqltest1.* FROM ''@'localhost%'; diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result index c4c8abce1cc..38d794d40c5 100644 --- a/mysql-test/suite/rpl/r/rpl_sp.result +++ b/mysql-test/suite/rpl/r/rpl_sp.result @@ -340,6 +340,7 @@ a connection master; drop procedure foo; connection slave; +disconnect con1; connection master; drop function fn1; drop database mysqltest1; diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result index 2b381b81d75..34d93df1164 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary.result +++ b/mysql-test/suite/rpl/r/rpl_temporary.result @@ -85,6 +85,7 @@ select * from t2 ORDER BY f; f 5 7 +disconnect con3; drop table t1, t2; drop user zedjzlcsjhd@localhost; use test; diff --git a/mysql-test/suite/rpl/t/rpl_read_only.test b/mysql-test/suite/rpl/t/rpl_read_only.test index 62a8fa618c3..268bd98bf27 100644 --- a/mysql-test/suite/rpl/t/rpl_read_only.test +++ b/mysql-test/suite/rpl/t/rpl_read_only.test @@ -146,6 +146,8 @@ connection master; xa rollback '1'; ## Cleanup +disconnect master2; +disconnect slave2; connection master; drop user test; drop table t1; diff --git a/mysql-test/suite/rpl/t/rpl_row_USER.test b/mysql-test/suite/rpl/t/rpl_row_USER.test index 9ca4b0e9231..2be1d0ee4aa 100644 --- a/mysql-test/suite/rpl/t/rpl_row_USER.test +++ b/mysql-test/suite/rpl/t/rpl_row_USER.test @@ -47,6 +47,7 @@ SELECT * FROM mysqltest1.t1 ORDER BY a; connection master; # Lets cleanup +disconnect m_1; DROP DATABASE mysqltest1; REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; diff --git a/mysql-test/suite/rpl/t/rpl_slave_invalid_external_user.test b/mysql-test/suite/rpl/t/rpl_slave_invalid_external_user.test index 5099d7ee49e..69a1980f982 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_invalid_external_user.test +++ b/mysql-test/suite/rpl/t/rpl_slave_invalid_external_user.test @@ -36,6 +36,7 @@ CREATE DEFINER='root'@'localhost' TRIGGER tr_after AFTER INSERT ON t1 FOR EACH R INSERT INTO t1 VALUES (1); --disable_connect_log # Cleanup +--disconnect conn_test --connection master DROP USER 'test_user'@'localhost'; DROP TABLE t1, t2; diff --git a/mysql-test/suite/rpl/t/rpl_sp.test b/mysql-test/suite/rpl/t/rpl_sp.test index 3e473d02f1a..e0115a93920 100644 --- a/mysql-test/suite/rpl/t/rpl_sp.test +++ b/mysql-test/suite/rpl/t/rpl_sp.test @@ -367,6 +367,7 @@ sync_slave_with_master; # Clean up +disconnect con1; connection master; drop function fn1; drop database mysqltest1; diff --git a/mysql-test/suite/rpl/t/rpl_temporary.test b/mysql-test/suite/rpl/t/rpl_temporary.test index 1c4106832c6..ba5ad10e582 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary.test +++ b/mysql-test/suite/rpl/t/rpl_temporary.test @@ -185,6 +185,7 @@ select * from t2 ORDER BY f; #--replace_column 2 # 5 # #show binlog events; +disconnect con3; drop table t1, t2; drop user zedjzlcsjhd@localhost; diff --git a/mysql-test/suite/sql_sequence/grant.result b/mysql-test/suite/sql_sequence/grant.result index fc3421efcb6..f34ad08a3b5 100644 --- a/mysql-test/suite/sql_sequence/grant.result +++ b/mysql-test/suite/sql_sequence/grant.result @@ -52,6 +52,11 @@ alter sequence s1 restart= 11; select * from s1; ERROR 42000: SELECT command denied to user 'only_alter'@'localhost' for table `mysqltest_1`.`s1` connection default; +disconnect normal; +disconnect read_only; +disconnect read_write; +disconnect alter; +disconnect only_alter; drop user 'normal'@'%'; drop user 'read_only'@'%'; drop user 'read_write'@'%'; diff --git a/mysql-test/suite/sql_sequence/grant.test b/mysql-test/suite/sql_sequence/grant.test index c205bd34223..e5cf572a62f 100644 --- a/mysql-test/suite/sql_sequence/grant.test +++ b/mysql-test/suite/sql_sequence/grant.test @@ -60,6 +60,11 @@ select * from s1; # connection default; +disconnect normal; +disconnect read_only; +disconnect read_write; +disconnect alter; +disconnect only_alter; drop user 'normal'@'%'; drop user 'read_only'@'%'; drop user 'read_write'@'%'; diff --git a/mysql-test/suite/sql_sequence/gtid.result b/mysql-test/suite/sql_sequence/gtid.result index e6d84b0c6a5..6ba05fc21a1 100644 --- a/mysql-test/suite/sql_sequence/gtid.result +++ b/mysql-test/suite/sql_sequence/gtid.result @@ -823,6 +823,9 @@ drop sequence s1; connection master; use s_db; drop database s_db; +disconnect m_normal_1; +disconnect m_normal_2; +disconnect m_normal_3; drop user normal_1@'%'; drop user normal_2@'%'; drop user normal_3@'%'; diff --git a/mysql-test/suite/sql_sequence/gtid.test b/mysql-test/suite/sql_sequence/gtid.test index 37c1c8d2b8c..4ad33762a16 100644 --- a/mysql-test/suite/sql_sequence/gtid.test +++ b/mysql-test/suite/sql_sequence/gtid.test @@ -700,6 +700,9 @@ drop sequence s1; connection master; use s_db; drop database s_db; +disconnect m_normal_1; +disconnect m_normal_2; +disconnect m_normal_3; drop user normal_1@'%'; drop user normal_2@'%'; drop user normal_3@'%'; diff --git a/mysql-test/suite/sql_sequence/replication.result b/mysql-test/suite/sql_sequence/replication.result index 2a8a5085bf5..ac44a8105c6 100644 --- a/mysql-test/suite/sql_sequence/replication.result +++ b/mysql-test/suite/sql_sequence/replication.result @@ -1086,6 +1086,8 @@ next_not_cached_value minimum_value maximum_value start_value increment cache_si connection master; drop table t1,s1; connection master; +disconnect m_normal_1; +disconnect m_normal_2; drop database s_db; drop user normal_1@'%'; drop user normal_2@'%'; diff --git a/mysql-test/suite/sql_sequence/replication.test b/mysql-test/suite/sql_sequence/replication.test index e4e48296bbf..9d747b52937 100644 --- a/mysql-test/suite/sql_sequence/replication.test +++ b/mysql-test/suite/sql_sequence/replication.test @@ -876,6 +876,8 @@ drop table t1,s1; # connection master; +disconnect m_normal_1; +disconnect m_normal_2; drop database s_db; drop user normal_1@'%'; drop user normal_2@'%'; diff --git a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result index c7082323429..6faa79ccaf7 100644 --- a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result +++ b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result @@ -85,6 +85,7 @@ f1(a) DROP FUNCTION f1; ## Dropping table t1 & t2 ## DROP TABLE t1,t2; +disconnect test_con1; disconnect test_con2; connection default; DROP USER tt@localhost; diff --git a/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test index b94ee6eabd0..783faf99673 100644 --- a/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test +++ b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test @@ -134,6 +134,7 @@ DROP FUNCTION f1; --echo ## Dropping table t1 & t2 ## DROP TABLE t1,t2; +disconnect test_con1; disconnect test_con2; connection default; diff --git a/mysql-test/suite/versioning/r/not_embedded.result b/mysql-test/suite/versioning/r/not_embedded.result index 5d8380e0969..31de051a220 100644 --- a/mysql-test/suite/versioning/r/not_embedded.result +++ b/mysql-test/suite/versioning/r/not_embedded.result @@ -65,9 +65,9 @@ Grants for mysqltest_1@localhost GRANT ALL PRIVILEGES ON *.* TO `mysqltest_1`@`localhost` GRANT DELETE HISTORY ON `mysqltest`.* TO `mysqltest_1`@`localhost` GRANT DELETE HISTORY ON `mysqltest`.`t` TO `mysqltest_1`@`localhost` +disconnect user1; drop user mysqltest_1@localhost; drop database mysqltest; -disconnect user1; disconnect root; connection default; # diff --git a/mysql-test/suite/versioning/t/not_embedded.test b/mysql-test/suite/versioning/t/not_embedded.test index 3d8bf252ae1..5b70e0f4505 100644 --- a/mysql-test/suite/versioning/t/not_embedded.test +++ b/mysql-test/suite/versioning/t/not_embedded.test @@ -70,9 +70,9 @@ connection root; grant all on *.* to mysqltest_1@localhost; show grants for mysqltest_1@localhost; +--disconnect user1 drop user mysqltest_1@localhost; drop database mysqltest; ---disconnect user1 --disconnect root --connection default diff --git a/plugin/disks/mysql-test/disks/disks_notembedded.result b/plugin/disks/mysql-test/disks/disks_notembedded.result index ea2ccc85bfb..4109ef99c5d 100644 --- a/plugin/disks/mysql-test/disks/disks_notembedded.result +++ b/plugin/disks/mysql-test/disks/disks_notembedded.result @@ -18,5 +18,6 @@ select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_sc sum(Total) >= sum(Available) sum(Total) >= sum(Used) 1 1 connection default; +disconnect con1; DROP USER user1@localhost; # End of 10.1 tests diff --git a/plugin/disks/mysql-test/disks/disks_notembedded.test b/plugin/disks/mysql-test/disks/disks_notembedded.test index 4481da9f176..27fbe1ba4f2 100644 --- a/plugin/disks/mysql-test/disks/disks_notembedded.test +++ b/plugin/disks/mysql-test/disks/disks_notembedded.test @@ -20,6 +20,7 @@ connect (con1,localhost,user1,,); connection con1; select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks; connection default; +disconnect con1; DROP USER user1@localhost; --echo # End of 10.1 tests diff --git a/storage/connect/mysql-test/connect/r/grant2.result b/storage/connect/mysql-test/connect/r/grant2.result index 0a29065b495..7250790fe41 100644 --- a/storage/connect/mysql-test/connect/r/grant2.result +++ b/storage/connect/mysql-test/connect/r/grant2.result @@ -762,6 +762,7 @@ connection user; CALL p_invoker(); ERROR 42000: Access denied; you need (at least one of) the FILE privilege(s) for this operation CALL p_definer(); +disconnect user; connection default; DROP TABLE t1; DROP PROCEDURE p_definer; diff --git a/storage/connect/mysql-test/connect/t/grant2.test b/storage/connect/mysql-test/connect/t/grant2.test index 351eb97f11a..f374b090b09 100644 --- a/storage/connect/mysql-test/connect/t/grant2.test +++ b/storage/connect/mysql-test/connect/t/grant2.test @@ -860,6 +860,7 @@ CALL p_baddefiner(); CALL p_invoker(); CALL p_definer(); +--disconnect user --connection default DROP TABLE t1; DROP PROCEDURE p_definer;