diff --git a/client/mysqltest.cc b/client/mysqltest.cc index e4b49fb3f3a..7f1021abb29 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5829,8 +5829,12 @@ void do_close_connection(struct st_command *command) DBUG_PRINT("info", ("Closing connection %s", con->name)); #ifndef EMBEDDED_LIBRARY if (command->type == Q_DIRTY_CLOSE) - { mariadb_cancel(con->mysql); + else + { + simple_command(con->mysql,COM_QUIT,0,0,0); + if (con->util_mysql) + simple_command(con->util_mysql,COM_QUIT,0,0,0); } #endif /*!EMBEDDED_LIBRARY*/ if (con->stmt) diff --git a/mysql-test/include/grant_cache.inc b/mysql-test/include/grant_cache.inc index 0fccee64372..cf85da89826 100644 --- a/mysql-test/include/grant_cache.inc +++ b/mysql-test/include/grant_cache.inc @@ -181,27 +181,13 @@ show status like "Qcache_not_cached"; # Cleanup -connection root; disconnect root; ---source include/wait_until_disconnected.inc -connection root2; disconnect root2; ---source include/wait_until_disconnected.inc -connection user1; disconnect user1; ---source include/wait_until_disconnected.inc -connection user2; disconnect user2; ---source include/wait_until_disconnected.inc -connection user3; disconnect user3; ---source include/wait_until_disconnected.inc -connection user4; disconnect user4; ---source include/wait_until_disconnected.inc -connection unkuser; disconnect unkuser; ---source include/wait_until_disconnected.inc connection default; # diff --git a/mysql-test/include/icp_debug_kill.inc b/mysql-test/include/icp_debug_kill.inc index d0ecc842869..41c9bf6b4bd 100644 --- a/mysql-test/include/icp_debug_kill.inc +++ b/mysql-test/include/icp_debug_kill.inc @@ -1,10 +1,5 @@ --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc - ---disable_warnings -drop table if exists t0,t1,t2; ---enable_warnings create table t0(a int primary key); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -46,5 +41,3 @@ set debug_sync='RESET'; disconnect con1; drop table t0,t1,t2; ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/include/percona_nonflushing_analyze_debug.inc b/mysql-test/include/percona_nonflushing_analyze_debug.inc index 8cdf6218609..8ecb9e45a2e 100644 --- a/mysql-test/include/percona_nonflushing_analyze_debug.inc +++ b/mysql-test/include/percona_nonflushing_analyze_debug.inc @@ -4,8 +4,6 @@ # $percona_nonflushing_analyze_table - table to test # ---source include/count_sessions.inc - --connect con1,localhost,root SET DEBUG_SYNC="handler_rnd_next_end SIGNAL idx_scan_in_progress WAIT_FOR finish_scan"; @@ -31,5 +29,3 @@ reap; --disconnect con1 --connection default SET DEBUG_SYNC='reset'; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/include/query_cache.inc b/mysql-test/include/query_cache.inc index 840118206f5..f6aae89b81f 100644 --- a/mysql-test/include/query_cache.inc +++ b/mysql-test/include/query_cache.inc @@ -189,7 +189,6 @@ show status like "Qcache_hits"; # Final cleanup disconnect connection1; ---source include/wait_until_disconnected.inc connection default; set @@global.query_cache_size = @save_query_cache_size; drop table t2; diff --git a/mysql-test/include/rowid_filter_debug_kill.inc b/mysql-test/include/rowid_filter_debug_kill.inc index 5c3ae214f02..8e90e8f7286 100644 --- a/mysql-test/include/rowid_filter_debug_kill.inc +++ b/mysql-test/include/rowid_filter_debug_kill.inc @@ -1,7 +1,6 @@ --source include/have_debug.inc --source include/have_debug_sync.inc --source include/have_sequence.inc ---source include/count_sessions.inc --source include/have_sequence.inc --source include/no_valgrind_without_big.inc @@ -80,4 +79,3 @@ set debug_sync='RESET'; drop table t2,t3; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/aborted_clients.test b/mysql-test/main/aborted_clients.test index 200bac03133..74651dbd7b9 100644 --- a/mysql-test/main/aborted_clients.test +++ b/mysql-test/main/aborted_clients.test @@ -2,15 +2,13 @@ # Check that ordinary connect/disconnect does not increase aborted_clients # status variable, but KILL connection does --- source include/not_embedded.inc --- source include/count_sessions.inc +--source include/not_embedded.inc FLUSH GLOBAL STATUS; # Connect/Disconnect look that aborted_clients stays 0 connect (con1,localhost,root,,); disconnect con1; connection default; --- source include/wait_until_count_sessions.inc # Check that there is 0 aborted clients so far SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients'; @@ -21,7 +19,6 @@ connect(con2,localhost,root,,); KILL CONNECTION_ID(); disconnect con2; connection default; --- source include/wait_until_count_sessions.inc # aborted clients must be 1 now SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients'; diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index ba949496a51..4c8b35c4d16 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -1780,7 +1780,6 @@ DROP TABLE t1; # --enable_info allows us to see how many rows were updated # by ALTER TABLE. in-place will show 0 rows, while copy > 0. # -DROP TABLE IF EXISTS ti1, ti2, ti3, tm1, tm2, tm3; # Single operation tests CREATE TABLE ti1(a INT NOT NULL, b INT, c INT) engine=InnoDB; CREATE TABLE tm1(a INT NOT NULL, b INT, c INT) engine=MyISAM; diff --git a/mysql-test/main/alter_table.test b/mysql-test/main/alter_table.test index 6385cb6945f..a02134d28b5 100644 --- a/mysql-test/main/alter_table.test +++ b/mysql-test/main/alter_table.test @@ -1318,8 +1318,6 @@ SELECT LENGTH(my_t3_fld1) FROM t3; # Cleanup --disconnect con1 ---source include/wait_until_disconnected.inc - --connection default DROP TABLE t1, t2, t3; @@ -1569,8 +1567,6 @@ connection con1; --echo # Reaping: ALTER TABLE t1 DISABLE KEYS --reap disconnect con1; ---source include/wait_until_disconnected.inc - connection default; DROP TABLE t1; @@ -1584,10 +1580,6 @@ DROP TABLE t1; --echo # by ALTER TABLE. in-place will show 0 rows, while copy > 0. --echo # ---disable_warnings -DROP TABLE IF EXISTS ti1, ti2, ti3, tm1, tm2, tm3; ---enable_warnings - --echo # Single operation tests CREATE TABLE ti1(a INT NOT NULL, b INT, c INT) engine=InnoDB; diff --git a/mysql-test/main/analyze_stmt_privileges2.test b/mysql-test/main/analyze_stmt_privileges2.test index 8b011c2b592..133572479b2 100644 --- a/mysql-test/main/analyze_stmt_privileges2.test +++ b/mysql-test/main/analyze_stmt_privileges2.test @@ -21,9 +21,6 @@ --source include/not_embedded.inc --source include/default_optimizer_switch.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - set GLOBAL sql_mode=""; set LOCAL sql_mode=""; @@ -5392,8 +5389,4 @@ connection default; DROP USER 'privtest'@localhost; USE test; DROP DATABASE privtest_db; - set GLOBAL sql_mode=default; ---source include/wait_until_count_sessions.inc - - diff --git a/mysql-test/main/aria_icp_debug.result b/mysql-test/main/aria_icp_debug.result index fc01ee4fb3b..d9427a93798 100644 --- a/mysql-test/main/aria_icp_debug.result +++ b/mysql-test/main/aria_icp_debug.result @@ -1,5 +1,4 @@ set default_storage_engine=aria; -drop table if exists t0,t1,t2; create table t0(a int primary key); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); create table t1(a int primary key); diff --git a/mysql-test/main/backup_priv.test b/mysql-test/main/backup_priv.test index c77075c2393..a446e85b31f 100644 --- a/mysql-test/main/backup_priv.test +++ b/mysql-test/main/backup_priv.test @@ -22,7 +22,6 @@ SELECT lock_mode FROM information_schema.metadata_lock_info WHERE lock_type='Bac change_user user2; SELECT lock_mode FROM information_schema.metadata_lock_info WHERE lock_type='Backup lock'; --disconnect con1 ---source include/wait_until_disconnected.inc --connection default --echo # A very low privileged user (-> con4) cannot acquire the backup lock @@ -39,7 +38,6 @@ BACKUP STAGE BLOCK_COMMIT; --error ER_SPECIFIC_ACCESS_DENIED_ERROR BACKUP STAGE END; --disconnect con1 ---source include/wait_until_disconnected.inc --connection default DROP USER user1@localhost, user2@localhost; diff --git a/mysql-test/main/backup_stages.test b/mysql-test/main/backup_stages.test index 1f5fb2d6828..22793db8f02 100644 --- a/mysql-test/main/backup_stages.test +++ b/mysql-test/main/backup_stages.test @@ -8,9 +8,6 @@ --source include/have_metadata_lock_info.inc # As non transactional engine we have MyISAM anyway. -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - let $old_lock_wait_timeout = `SELECT @@global.lock_wait_timeout`; --echo #----------------------------------------------------------------------- @@ -384,4 +381,3 @@ SET GLOBAL lock_wait_timeout = $old_lock_wait_timeout; --disconnect backup --connection default ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/binary_to_hex.result b/mysql-test/main/binary_to_hex.result index 3918021f3e6..c24f91eef63 100644 --- a/mysql-test/main/binary_to_hex.result +++ b/mysql-test/main/binary_to_hex.result @@ -1,5 +1,3 @@ -USE test; -DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 (c1 TINYBLOB, c2 BLOB, c3 MEDIUMBLOB, diff --git a/mysql-test/main/binary_to_hex.test b/mysql-test/main/binary_to_hex.test index be4fb301e40..bd7397313fb 100644 --- a/mysql-test/main/binary_to_hex.test +++ b/mysql-test/main/binary_to_hex.test @@ -8,15 +8,8 @@ # CLIENT (CONTRIBUTION) # -# Save the initial number of concurrent sessions ---source include/count_sessions.inc --source include/not_embedded.inc -USE test; ---disable_warnings -DROP TABLE IF EXISTS t1, t2; ---enable_warnings - CREATE TABLE t1 (c1 TINYBLOB, c2 BLOB, c3 MEDIUMBLOB, @@ -91,6 +84,3 @@ remove_file $MYSQLTEST_VARDIR/tmp/mdev-14593.sql; #Cleanup DROP TABLE t1; - -# Wait till all disconnects are completed - --source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/bug39022.test b/mysql-test/main/bug39022.test index 81dd6f14bed..bceb7229cba 100644 --- a/mysql-test/main/bug39022.test +++ b/mysql-test/main/bug39022.test @@ -52,11 +52,9 @@ connection thread2; REAP; disconnect thread2; ---source include/wait_until_disconnected.inc connection thread1; disconnect thread1; ---source include/wait_until_disconnected.inc connection default; diff --git a/mysql-test/main/check.result b/mysql-test/main/check.result index e7d26778e88..663edf18ee0 100644 --- a/mysql-test/main/check.result +++ b/mysql-test/main/check.result @@ -1,8 +1,6 @@ connect con1,localhost,root,,; connect con2,localhost,root,,; connection con1; -drop table if exists t1,t2; -drop view if exists v1; create table t1(n int not null, key(n), key(n), key(n), key(n)); Warnings: Note 1831 Duplicate index `n_2`. This is deprecated and will be disallowed in a future release @@ -18,6 +16,7 @@ connection default; disconnect con1; disconnect con2; drop table t1; +# End of 4.1 tests Create table t1(f1 int); Create table t2(f1 int); Create view v1 as Select * from t1; diff --git a/mysql-test/main/check.test b/mysql-test/main/check.test index 29587a9f623..911476093fe 100644 --- a/mysql-test/main/check.test +++ b/mysql-test/main/check.test @@ -1,13 +1,6 @@ -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (con1,localhost,root,,); connect (con2,localhost,root,,); connection con1; ---disable_warnings -drop table if exists t1,t2; -drop view if exists v1; ---enable_warnings # Add a lot of keys to slow down check create table t1(n int not null, key(n), key(n), key(n), key(n)); @@ -32,7 +25,7 @@ disconnect con2; drop table t1; -# End of 4.1 tests +--echo # End of 4.1 tests # # Bug#9897 Views: 'Check Table' crashes MySQL, with a view and a table @@ -76,10 +69,6 @@ UNLOCK TABLES; DROP TABLE t1; disconnect con1; - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc - --echo # --echo # MDEV-15338 --echo # Assertion `!table || (!table->read_set || diff --git a/mysql-test/main/client_xml.result b/mysql-test/main/client_xml.result index 6f91c18318c..1c090300f19 100644 --- a/mysql-test/main/client_xml.result +++ b/mysql-test/main/client_xml.result @@ -1,6 +1,5 @@ set @old_concurrent_insert= @@global.concurrent_insert; set @@global.concurrent_insert= 0; -drop table if exists t1; create table t1 ( `a&b` int, `a $MYSQLTEST_VARDIR/tmp/fix_priv_tables.log 2>&1 --remove_file $MYSQLTEST_VARDIR/tmp/fix_priv_tables.log -# Wait till the number of open sessions is <= the number before the run with $MYSQL -# = The session caused by mysql has finished its disconnect ---source include/wait_until_count_sessions.inc --- enable_query_log --- enable_result_log +--enable_query_log +--enable_result_log -echo "after fix privs"; +echo # after fix privs; SHOW GRANTS FOR 'show_view_tbl'@'localhost'; echo; @@ -79,4 +69,4 @@ DROP VIEW testdb.v1; DROP TABLE testdb.t1; DROP DATABASE testdb; -# End of 4.1 tests +--echo # End of 4.1 tests diff --git a/mysql-test/main/flush-innodb-notembedded.test b/mysql-test/main/flush-innodb-notembedded.test index 1f73ba50fc4..0677fa62a48 100644 --- a/mysql-test/main/flush-innodb-notembedded.test +++ b/mysql-test/main/flush-innodb-notembedded.test @@ -18,7 +18,6 @@ GRANT RELOAD, LOCK TABLES ON *.* TO user5@localhost; FLUSH TABLE db1.t1 FOR EXPORT; UNLOCK TABLES; --disconnect con1 ---source include/wait_until_disconnected.inc --connection default @@ -26,7 +25,6 @@ UNLOCK TABLES; --error ER_SPECIFIC_ACCESS_DENIED_ERROR FLUSH TABLE db1.t1 FOR EXPORT; --disconnect con1 ---source include/wait_until_disconnected.inc --connection default @@ -34,7 +32,6 @@ FLUSH TABLE db1.t1 FOR EXPORT; --error ER_DBACCESS_DENIED_ERROR FLUSH TABLE db1.t1 FOR EXPORT; --disconnect con1 ---source include/wait_until_disconnected.inc --connection default @@ -42,7 +39,6 @@ FLUSH TABLE db1.t1 FOR EXPORT; --error ER_SPECIFIC_ACCESS_DENIED_ERROR FLUSH TABLE db1.t1 FOR EXPORT; --disconnect con1 ---source include/wait_until_disconnected.inc --connection default @@ -50,7 +46,6 @@ FLUSH TABLE db1.t1 FOR EXPORT; --error ER_TABLEACCESS_DENIED_ERROR FLUSH TABLE db1.t1 FOR EXPORT; --disconnect con1 ---source include/wait_until_disconnected.inc --connection default DROP USER user1@localhost, user2@localhost, user3@localhost, diff --git a/mysql-test/main/flush-innodb.result b/mysql-test/main/flush-innodb.result index 5df79e4cc0c..351ca0a34d2 100644 --- a/mysql-test/main/flush-innodb.result +++ b/mysql-test/main/flush-innodb.result @@ -157,7 +157,6 @@ CREATE TABLE t1(a INT) engine= MEMORY; FLUSH TABLE t1 FOR EXPORT; ERROR HY000: Storage engine MEMORY of the table `test`.`t1` doesn't have this option DROP TABLE t1; -connection con1; disconnect con1; connection default; # Test 7: Check privileges required. @@ -198,7 +197,6 @@ LOCK TABLE t1 READ; UNLOCK TABLES; connection default; UNLOCK TABLES; -connection con1; disconnect con1; connection default; DROP TABLE t1, t2; @@ -294,7 +292,6 @@ ERROR HY000: Can't execute the given command because you have active locked tabl LOCK TABLES test.t1 WRITE; UNLOCK TABLES; DROP TABLE t1; -connection con1; disconnect con1; connection default; # End of 5.6 tests diff --git a/mysql-test/main/flush-innodb.test b/mysql-test/main/flush-innodb.test index fcb0608373e..cf62ba6aec6 100644 --- a/mysql-test/main/flush-innodb.test +++ b/mysql-test/main/flush-innodb.test @@ -222,8 +222,6 @@ UNLOCK TABLES; --echo # Reaping DROP TABLE t1 --reap --disconnect con2 ---source include/wait_until_disconnected.inc - --connection default DROP TABLE t2; @@ -250,10 +248,7 @@ CREATE TABLE t1(a INT) engine= MEMORY; FLUSH TABLE t1 FOR EXPORT; DROP TABLE t1; ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc - --connection default --echo # Test 7: Check privileges required. @@ -313,10 +308,7 @@ UNLOCK TABLES; --connection default UNLOCK TABLES; ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc - --connection default DROP TABLE t1, t2; @@ -423,9 +415,7 @@ LOCK TABLES test.t1 WRITE; UNLOCK TABLES; DROP TABLE t1; ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc --connection default --echo # End of 5.6 tests diff --git a/mysql-test/main/flush.result b/mysql-test/main/flush.result index 584e79e72db..ccc7dc8b771 100644 --- a/mysql-test/main/flush.result +++ b/mysql-test/main/flush.result @@ -281,7 +281,6 @@ lock table t1 read, t2 read; unlock tables; connection default; unlock tables; -connection con1; disconnect con1; connection default; drop table t1, t2, t3; @@ -399,9 +398,7 @@ connection con2; connection default; commit; # Cleanup -connection con1; disconnect con1; -connection con2; disconnect con2; connection default; drop table t1; @@ -480,9 +477,7 @@ connection default; # Reap INSERT. handler t1 close; # Cleanup. -connection con1; disconnect con1; -connection con2; disconnect con2; connection default; drop tables t1, t2; diff --git a/mysql-test/main/flush.test b/mysql-test/main/flush.test index 1085b469a03..cb81f6e0fbc 100644 --- a/mysql-test/main/flush.test +++ b/mysql-test/main/flush.test @@ -177,7 +177,6 @@ set session low_priority_updates=default; connect (con1,localhost,root,,); send select benchmark(200, (select sin(1))) > 1000; disconnect con1; ---source include/wait_until_disconnected.inc connection default; --echo End of 5.0 tests @@ -361,9 +360,7 @@ unlock tables; connection default; unlock tables; -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc connection default; drop table t1, t2, t3; @@ -490,12 +487,8 @@ commit; --echo # Cleanup -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc connection default; drop table t1; --enable_view_protocol @@ -571,12 +564,8 @@ connection default; handler t1 close; --echo # Cleanup. -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc connection default; drop tables t1, t2; --enable_view_protocol @@ -629,7 +618,6 @@ connect(con1, localhost, root); FLUSH TABLES WITH READ LOCK; UNLOCK TABLES; disconnect con1; ---source include/wait_until_disconnected.inc connection default; COMMIT; diff --git a/mysql-test/main/flush_block_commit.result b/mysql-test/main/flush_block_commit.result index 73ea8859f1d..1f577004ebd 100644 --- a/mysql-test/main/flush_block_commit.result +++ b/mysql-test/main/flush_block_commit.result @@ -1,9 +1,7 @@ -# Save the initial number of concurrent sessions connect con1,localhost,root,,; connect con2,localhost,root,,; connect con3,localhost,root,,; connection con1; -DROP TABLE IF EXISTS t1; CREATE TABLE t1 (a INT) ENGINE=innodb; BEGIN; INSERT INTO t1 VALUES(1); @@ -65,4 +63,3 @@ disconnect con3; # drop the table. DROP TABLE t1; # End of 4.1 tests -# Wait till all disconnects are completed diff --git a/mysql-test/main/flush_block_commit.test b/mysql-test/main/flush_block_commit.test index 0280aedf2ca..9161ebb90f9 100644 --- a/mysql-test/main/flush_block_commit.test +++ b/mysql-test/main/flush_block_commit.test @@ -6,17 +6,11 @@ # And it requires InnoDB --source include/have_innodb.inc ---echo # Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (con1,localhost,root,,); connect (con2,localhost,root,,); connect (con3,localhost,root,,); connection con1; ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings CREATE TABLE t1 (a INT) ENGINE=innodb; # blocks COMMIT ? @@ -92,7 +86,3 @@ disconnect con3; --echo # drop the table. DROP TABLE t1; --echo # End of 4.1 tests - ---echo # Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/main/flush_block_commit_notembedded.result b/mysql-test/main/flush_block_commit_notembedded.result index 7dd6410ac70..d96eae85cea 100644 --- a/mysql-test/main/flush_block_commit_notembedded.result +++ b/mysql-test/main/flush_block_commit_notembedded.result @@ -1,4 +1,3 @@ -# Save the initial number of concurrent sessions connect con1,localhost,root,,; connect con2,localhost,root,,; connection con1; @@ -33,4 +32,3 @@ drop table t1; connection default; disconnect con1; disconnect con2; -# Wait till all disconnects are completed diff --git a/mysql-test/main/flush_block_commit_notembedded.test b/mysql-test/main/flush_block_commit_notembedded.test index 024640893d9..13899a24558 100644 --- a/mysql-test/main/flush_block_commit_notembedded.test +++ b/mysql-test/main/flush_block_commit_notembedded.test @@ -9,9 +9,6 @@ --source include/have_log_bin.inc --source include/have_innodb.inc ---echo # Save the initial number of concurrent sessions ---source include/count_sessions.inc - --disable_query_log # This may be triggered on a slow system or one that lacks native AIO. call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations"); @@ -62,7 +59,3 @@ drop table t1; connection default; disconnect con1; disconnect con2; - ---echo # Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index 358f020d4bc..8708d75ac0a 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -9,9 +9,7 @@ --source include/have_debug_sync.inc # Parts of this test use DDL on events, BINLOG statement and # other statements which are not supported in embedded server. --- source include/not_embedded.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc +--source include/not_embedded.inc set global sql_mode=""; set local sql_mode=""; @@ -2144,10 +2142,6 @@ disconnect con2; disconnect con3; set global sql_mode=default; -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc - --echo # --echo # Deadlock between FTWRL under open handler and DDL/LOCK TABLES diff --git a/mysql-test/main/flush_read_lock_kill.test b/mysql-test/main/flush_read_lock_kill.test index 8b76c065227..8807ea70ca7 100644 --- a/mysql-test/main/flush_read_lock_kill.test +++ b/mysql-test/main/flush_read_lock_kill.test @@ -13,9 +13,6 @@ # won't block FLUSH TABLES WITH GLOBAL READ LOCK. --source include/have_innodb.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (con1,localhost,root,,); connect (con2,localhost,root,,); connection con1; @@ -75,7 +72,3 @@ connection default; disconnect con2; DROP TABLE t1; SET DEBUG_SYNC= 'RESET'; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/main/func_compress.test b/mysql-test/main/func_compress.test index d1822a099a3..a8170eed2db 100644 --- a/mysql-test/main/func_compress.test +++ b/mysql-test/main/func_compress.test @@ -59,7 +59,6 @@ set @@global.max_allowed_packet=1048576*100; --connect (newconn, localhost, root,,) eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null; disconnect newconn; ---source include/wait_until_disconnected.inc connection default; set @@global.max_allowed_packet=@save_max_allowed_packet; diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result index 3f70f1b2b93..1ddb0dc0b06 100644 --- a/mysql-test/main/grant.result +++ b/mysql-test/main/grant.result @@ -1294,8 +1294,6 @@ connection bug23556; USE bug23556; TRUNCATE t1; connection default; -USE bug23556; -DROP TABLE t1; USE test; DROP DATABASE bug23556; DROP USER bug23556@localhost; @@ -1779,12 +1777,6 @@ 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 table t1,t2,t4,t5,t6; -revoke create on mysqltest.* from mysqltest@localhost; -revoke select, insert on mysqltest.t2 from mysqltest@localhost; -revoke insert on mysqltest.t4 from mysqltest@localhost; -revoke create, insert on mysqltest.t5 from mysqltest@localhost; -revoke create, insert on mysqltest.t6 from mysqltest@localhost; drop user mysqltest@localhost; disconnect user1; drop database mysqltest; @@ -2833,13 +2825,8 @@ CREATE USER bug33578113; GRANT DROP ON performance_schema.* TO bug33578113; REVOKE DROP ON performance_schema.* FROM bug33578113; DROP USER bug33578113; -# # End of 10.2 tests # -# -# Start of 10.3 tests -# -# # MDEV-19948 'show grants' return privileges individually # # switching from mysql.global_priv to mysql.user @@ -2854,10 +2841,8 @@ Grants for ten2@% GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, BINLOG MONITOR, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, DELETE HISTORY, SET USER, FEDERATED ADMIN, CONNECTION ADMIN, READ_ONLY ADMIN, REPLICATION SLAVE ADMIN, REPLICATION MASTER ADMIN, BINLOG ADMIN, BINLOG REPLAY, SLAVE MONITOR ON *.* TO `ten2`@`%` DROP USER ten2; # switching back from mysql.user to mysql.global_priv -# # End of 10.3 tests # -# # MDEV-17932 : Assertion upon double RENAME USER # CREATE USER foo@localhost; @@ -2876,7 +2861,5 @@ GRANT UPDATE ON test.* TO foo; RENAME USER 'name' to 'a'; DROP USER foo; DROP USER a; -# # End of 10.4 tests -# update mysql.global_priv set priv=@root_priv where user='root' and host='localhost'; diff --git a/mysql-test/main/grant.test b/mysql-test/main/grant.test index 0aafc43601b..2dc263e1f14 100644 --- a/mysql-test/main/grant.test +++ b/mysql-test/main/grant.test @@ -3,16 +3,11 @@ # Grant tests not performed with embedded server --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - set GLOBAL sql_mode=""; set LOCAL sql_mode=""; SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; ---disable_cursor_protocol select priv into @root_priv from mysql.global_priv where user='root' and host='localhost'; ---enable_cursor_protocol connect (master,localhost,root,,); connection master; @@ -967,8 +962,6 @@ USE bug23556; TRUNCATE t1; connection default; -USE bug23556; -DROP TABLE t1; USE test; DROP DATABASE bug23556; DROP USER bug23556@localhost; @@ -1570,17 +1563,8 @@ create table t4 select * from t2; --error ER_TABLEACCESS_DENIED_ERROR create table t1 select * from t2; - connection default; -drop table t1,t2,t4,t5,t6; - -revoke create on mysqltest.* from mysqltest@localhost; -revoke select, insert on mysqltest.t2 from mysqltest@localhost; -revoke insert on mysqltest.t4 from mysqltest@localhost; -revoke create, insert on mysqltest.t5 from mysqltest@localhost; -revoke create, insert on mysqltest.t6 from mysqltest@localhost; drop user mysqltest@localhost; - disconnect user1; drop database mysqltest; use test; @@ -2228,8 +2212,6 @@ DROP USER untrusted@localhost; DROP DATABASE secret; set GLOBAL sql_mode=default; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc --echo # --echo # MDEV-22755 CREATE USER leads to indirect SIGABRT in __stack_chk_fail () from fill_schema_user_privileges + *** stack smashing detected *** (on optimized builds) @@ -2299,15 +2281,8 @@ CREATE USER bug33578113; GRANT DROP ON performance_schema.* TO bug33578113; REVOKE DROP ON performance_schema.* FROM bug33578113; DROP USER bug33578113; ---source include/wait_until_count_sessions.inc ---echo # --echo # End of 10.2 tests ---echo # - ---echo # ---echo # Start of 10.3 tests ---echo # --echo # --echo # MDEV-19948 'show grants' return privileges individually @@ -2330,9 +2305,7 @@ SHOW GRANTS FOR ten2; DROP USER ten2; source include/switch_to_mysql_global_priv.inc; ---echo # --echo # End of 10.3 tests ---echo # --echo # --echo # MDEV-17932 : Assertion upon double RENAME USER @@ -2355,8 +2328,6 @@ RENAME USER 'name' to 'a'; DROP USER foo; DROP USER a; ---echo # --echo # End of 10.4 tests ---echo # update mysql.global_priv set priv=@root_priv where user='root' and host='localhost'; diff --git a/mysql-test/main/grant2.result b/mysql-test/main/grant2.result index ebf83272713..3e40ad8ac79 100644 --- a/mysql-test/main/grant2.result +++ b/mysql-test/main/grant2.result @@ -2,13 +2,6 @@ select priv into @root_priv from mysql.global_priv where user='root' and host='l set GLOBAL sql_mode=""; set LOCAL sql_mode=""; SET NAMES binary; -drop database if exists mysqltest; -drop database if exists mysqltest_1; -delete from mysql.user where user like 'mysqltest\_%'; -delete from mysql.db where user like 'mysqltest\_%'; -delete from mysql.tables_priv where user like 'mysqltest\_%'; -delete from mysql.columns_priv where user like 'mysqltest\_%'; -flush privileges; grant all privileges on `my\_1`.* to mysqltest_1@localhost with grant option; grant create user on *.* to mysqltest_1@localhost; create user mysqltest_2@localhost; diff --git a/mysql-test/main/grant2.test b/mysql-test/main/grant2.test index 26a2a40245f..27960189399 100644 --- a/mysql-test/main/grant2.test +++ b/mysql-test/main/grant2.test @@ -1,9 +1,6 @@ # Grant tests not performed with embedded server -- source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - select priv into @root_priv from mysql.global_priv where user='root' and host='localhost'; set GLOBAL sql_mode=""; @@ -15,19 +12,6 @@ SET NAMES binary; # (usually it's GRANT, reconnect as another user, try something) # - -# prepare playground before tests ---disable_warnings -drop database if exists mysqltest; -drop database if exists mysqltest_1; ---enable_warnings -delete from mysql.user where user like 'mysqltest\_%'; -delete from mysql.db where user like 'mysqltest\_%'; -delete from mysql.tables_priv where user like 'mysqltest\_%'; -delete from mysql.columns_priv where user like 'mysqltest\_%'; -flush privileges; - - grant all privileges on `my\_1`.* to mysqltest_1@localhost with grant option; grant create user on *.* to mysqltest_1@localhost; create user mysqltest_2@localhost; @@ -1022,7 +1006,4 @@ DROP USER mysqltest_u3@localhost; DROP USER mysqltest_u4@localhost; DROP USER mysqltest_u5@localhost; - set GLOBAL sql_mode=default; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/grant3.result b/mysql-test/main/grant3.result index 66f081a5689..62a592849fb 100644 --- a/mysql-test/main/grant3.result +++ b/mysql-test/main/grant3.result @@ -3,7 +3,6 @@ set local sql_mode=""; SET NAMES binary; connect master,localhost,root,,; connection master; -drop table if exists t1; delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.db where user like 'mysqltest\_%'; delete from mysql.tables_priv where user like 'mysqltest\_%'; diff --git a/mysql-test/main/grant3.test b/mysql-test/main/grant3.test index 7842233d9bd..db55505c7af 100644 --- a/mysql-test/main/grant3.test +++ b/mysql-test/main/grant3.test @@ -1,8 +1,5 @@ # Can't run with embedded server because we use GRANT --- source include/not_embedded.inc - -# Save the initial number of concurrent sessions ---source include/count_sessions.inc +--source include/not_embedded.inc set global sql_mode=""; set local sql_mode=""; @@ -13,11 +10,6 @@ SET NAMES binary; connect (master,localhost,root,,); connection master; -# Cleanup ---disable_warnings -drop table if exists t1; ---enable_warnings - delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.db where user like 'mysqltest\_%'; delete from mysql.tables_priv where user like 'mysqltest\_%'; @@ -237,6 +229,3 @@ disconnect foo; connection default; drop user foo@localhost; drop database db1; - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/grant4.test b/mysql-test/main/grant4.test index cda1c5fb281..d345d278b80 100644 --- a/mysql-test/main/grant4.test +++ b/mysql-test/main/grant4.test @@ -231,7 +231,6 @@ repair table mysqltest_db1.t1; --echo # Clean-up. disconnect con1; ---source include/wait_until_disconnected.inc connection default; drop database mysqltest_db1; drop user mysqltest_u1@localhost; diff --git a/mysql-test/main/grant_cache_no_prot.result b/mysql-test/main/grant_cache_no_prot.result index daf382d65d3..7c5dd05f349 100644 --- a/mysql-test/main/grant_cache_no_prot.result +++ b/mysql-test/main/grant_cache_no_prot.result @@ -226,19 +226,12 @@ Qcache_hits 8 show status like "Qcache_not_cached"; Variable_name Value Qcache_not_cached 5 -connection root; disconnect root; -connection root2; disconnect root2; -connection user1; disconnect user1; -connection user2; disconnect user2; -connection user3; disconnect user3; -connection user4; disconnect user4; -connection unkuser; disconnect unkuser; connection default; set names binary; diff --git a/mysql-test/main/grant_cache_ps_prot.result b/mysql-test/main/grant_cache_ps_prot.result index 0fde04ac0f3..36937323cdb 100644 --- a/mysql-test/main/grant_cache_ps_prot.result +++ b/mysql-test/main/grant_cache_ps_prot.result @@ -226,19 +226,12 @@ Qcache_hits 8 show status like "Qcache_not_cached"; Variable_name Value Qcache_not_cached 4 -connection root; disconnect root; -connection root2; disconnect root2; -connection user1; disconnect user1; -connection user2; disconnect user2; -connection user3; disconnect user3; -connection user4; disconnect user4; -connection unkuser; disconnect unkuser; connection default; set names binary; diff --git a/mysql-test/main/grant_explain_non_select.test b/mysql-test/main/grant_explain_non_select.test index 2bde3bed17c..4945ebf027f 100644 --- a/mysql-test/main/grant_explain_non_select.test +++ b/mysql-test/main/grant_explain_non_select.test @@ -3,10 +3,7 @@ # # Grant tests not performed with embedded server --- source include/not_embedded.inc - -# Save the initial number of concurrent sessions ---source include/count_sessions.inc +--source include/not_embedded.inc --source include/default_optimizer_switch.inc set GLOBAL sql_mode=""; @@ -261,5 +258,3 @@ DROP DATABASE privtest_db; set GLOBAL sql_mode=default; set LOCAL sql_mode=default; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/grant_kill.result b/mysql-test/main/grant_kill.result index 39a7e8fd5cb..2f82e347dd5 100644 --- a/mysql-test/main/grant_kill.result +++ b/mysql-test/main/grant_kill.result @@ -46,6 +46,4 @@ disconnect foo; disconnect bar; DROP USER foo@localhost; DROP USER bar@localhost; -# # End of 10.5 tests -# diff --git a/mysql-test/main/grant_kill.test b/mysql-test/main/grant_kill.test index 4cd7a84d18d..912e4301a10 100644 --- a/mysql-test/main/grant_kill.test +++ b/mysql-test/main/grant_kill.test @@ -9,8 +9,6 @@ --echo # --disable_service_connection ---let $count_sessions=1 - --echo # --echo # Test that KILL is not allowed without CONNECTION ADMIN --echo # @@ -30,7 +28,6 @@ SELECT user FROM information_schema.processlist ORDER BY user; --disconnect foo --disconnect bar --connection default ---source include/wait_until_count_sessions.inc DROP USER foo@localhost; DROP USER bar@localhost; @@ -55,12 +52,9 @@ let $wait_condition= --source include/wait_condition.inc --disconnect foo --disconnect bar ---source include/wait_until_count_sessions.inc DROP USER foo@localhost; DROP USER bar@localhost; --enable_service_connection ---echo # --echo # End of 10.5 tests ---echo # diff --git a/mysql-test/main/grant_master_admin.test b/mysql-test/main/grant_master_admin.test index c98c374f7e9..6957ccfd322 100644 --- a/mysql-test/main/grant_master_admin.test +++ b/mysql-test/main/grant_master_admin.test @@ -41,7 +41,6 @@ SHOW SLAVE HOSTS; connection default; DROP USER user1@localhost; - --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/grant_utf8_cli.result b/mysql-test/main/grant_utf8_cli.result index fedfaf984b2..93f62747f54 100644 --- a/mysql-test/main/grant_utf8_cli.result +++ b/mysql-test/main/grant_utf8_cli.result @@ -3,6 +3,5 @@ create user юзер_юзер@localhost; grant select on test.* to юзер_юзер@localhost; user() юзер_юзер@localhost -revoke all on test.* from юзер_юзер@localhost; drop user юзер_юзер@localhost; set names default; diff --git a/mysql-test/main/grant_utf8_cli.test b/mysql-test/main/grant_utf8_cli.test index bc811d5298e..2fe7c9ad94c 100644 --- a/mysql-test/main/grant_utf8_cli.test +++ b/mysql-test/main/grant_utf8_cli.test @@ -8,6 +8,5 @@ set names utf8; create user юзер_юзер@localhost; grant select on test.* to юзер_юзер@localhost; --exec $MYSQL --default-character-set=utf8 --user=юзер_юзер -e "select user()" -revoke all on test.* from юзер_юзер@localhost; drop user юзер_юзер@localhost; set names default; diff --git a/mysql-test/main/host_cache_size_functionality.test b/mysql-test/main/host_cache_size_functionality.test index 3f97787248c..35220e62c14 100644 --- a/mysql-test/main/host_cache_size_functionality.test +++ b/mysql-test/main/host_cache_size_functionality.test @@ -122,59 +122,4 @@ SELECT COUNT(@@GLOBAL.Host_Cache_Size); SELECT Host_Cache_Size = @@SESSION.Host_Cache_Size; --echo Expected error 'Unknown column Host_Cache_Size in field list' -#The below check has been commented out as the IP fetch is different in a P2P connection than BroadBand connection -#--echo '#---------------------WL6372_VAR_6_06----------------------#' -############################################################################### -# Checking the Host cache functionality # -############################################################################### - -#SET @@GLOBAL.Host_Cache_Size=2; -#--disable_warnings - -#--perl -#my $ip=`ifconfig | egrep "inet addr|inet" | sed -e 's/^.*inet addr://' -e 's/^.*inet//'| sed 's/ .*\$//'|egrep -i "broadcast|bcast"|head -1|awk '{print $1}'`; -#open (LOGFH, ">" . $ENV{'MYSQL_TMP_DIR'} . "/bind_ip"); -#print LOGFH "let \$bind_ip = $ip;\n"; -#close LOGFH; -#EOF - -#--source $MYSQL_TMP_DIR/bind_ip -#--remove_file $MYSQL_TMP_DIR/bind_ip - -#let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; -#--write_line wait $restart_file -#--shutdown_server -#--source include/wait_until_disconnected.inc -#-- write_line "restart:--bind-address=$bind_ip " $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -#-- enable_reconnect -#-- source include/wait_until_connected_again.inc - -#connection default; -#--disable_warnings - -#create user binduser; -#grant all on *.* to binduser; - -#select count(IP) from performance_schema.host_cache; -#--echo 0 Expected - -#connect (con1,$bind_ip,binduser,,); -#select count(IP) from performance_schema.host_cache; -#--echo 1 Expected - -#disconnect con1; -#connection default; - -#--disable_warnings - -# The below check is hashed until the BUG14689561# is fixed -# -#flush hosts; - -#connect (con2,$bind_ip,binduser,,); -#select count(IP) from performance_schema.host_cache; -#--echo 1 Expected - -#disconnect con2; - SET @@GLOBAL.Host_Cache_Size=DEFAULT; diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result index 1e024ffc88b..24b2a5d8f0e 100644 --- a/mysql-test/main/information_schema.result +++ b/mysql-test/main/information_schema.result @@ -1,7 +1,5 @@ set global sql_mode=""; set local sql_mode=""; -DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5; -DROP VIEW IF EXISTS v1; show variables where variable_name like "skip_show_database"; Variable_name Value skip_show_database OFF @@ -2340,13 +2338,8 @@ connection default; disconnect con1; set global sql_mode=default; USE test; -# # End of 10.0 tests # -# -# Start of 10.1 tests -# -# # MDEV-13242 Wrong results for queries with row constructors and information_schema # CREATE TABLE tt1(c1 INT); @@ -2378,10 +2371,8 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name='aaaaaaaaa SCHEMA_NAME SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a',193); SCHEMA_NAME -# # End of 10.1 tests # -# # MDEV-14836: Assertion `m_status == DA_ERROR' failed in # Diagnostics_area::sql_errno upon query from I_S with LIMIT ROWS EXAMINED # @@ -2422,10 +2413,8 @@ SELECT TABLE_SCHEMA, TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEM TABLE_SCHEMA TABLE_NAME a/~.b t1 DROP DATABASE `a/~.b`; -# # End of 10.2 Test # -# # MDEV-21201:No records produced in information_schema query, # depending on projection # @@ -2563,10 +2552,8 @@ SET SQL_MODE=DEFAULT; select progress from information_schema.processlist limit 1; progress 0.000 -# # End of 10.3 tests # -# # MDEV-MDEV-31064 Changes of the procedure are not immediatly seen in queries to I_S.parameter from other connections # CREATE PROCEDURE sp1(IN p1 INT, IN p2 INT) @@ -2585,13 +2572,8 @@ COUNT(*) disconnect con2; connection default; DROP PROCEDURE sp1; -# # End of 10.4 tests # -# -# Start of 10.5 tests -# -# # MDEV-26507 Assertion `tmp != ((long long) 0x8000000000000000LL)' failed in TIME_from_longlong_datetime_packed # CREATE TABLE t1 (a int); @@ -2606,6 +2588,4 @@ created SET SESSION sql_mode=DEFAULT; DROP VIEW i; DROP TABLE t1; -# # End of 10.5 tests -# diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test index d3c9803b18c..81ca0e22df2 100644 --- a/mysql-test/main/information_schema.test +++ b/mysql-test/main/information_schema.test @@ -1,6 +1,6 @@ # This test uses grants, which can't get tested for embedded server --- source include/not_embedded.inc --- source include/have_perfschema.inc +--source include/not_embedded.inc +--source include/have_perfschema.inc # check that CSV engine was compiled in, as the result of the test depends # on the presence of the log tables (which are CSV-based). @@ -8,13 +8,9 @@ # Without aria_used_for_temp_tables some I_S tables will be MyISAM, # while the test expects them to be Aria --- source include/have_aria_used_for_temp_tables.inc - --- source include/have_innodb.inc - -# Save the initial number of concurrent sessions ---source include/count_sessions.inc +--source include/have_aria_used_for_temp_tables.inc +--source include/have_innodb.inc --source include/default_optimizer_switch.inc --source include/default_charset.inc @@ -26,12 +22,6 @@ set local sql_mode=""; # Test for information_schema.schemata & # show databases ---disable_warnings -DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5; -DROP VIEW IF EXISTS v1; ---enable_warnings - - show variables where variable_name like "skip_show_database"; grant select, update, execute on test.* to mysqltest_2@localhost; grant select, update on test.* to mysqltest_1@localhost; @@ -1647,7 +1637,6 @@ connection con1; --echo # Reaping 'flush tables' reap; disconnect con1; ---source include/wait_until_disconnected.inc connection default; drop table t1; drop view v1; @@ -1886,22 +1875,11 @@ drop database db1; connection default; disconnect con1; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - set global sql_mode=default; USE test; ---echo # --echo # End of 10.0 tests ---echo # - - ---echo # ---echo # Start of 10.1 tests ---echo # - --echo # --echo # MDEV-13242 Wrong results for queries with row constructors and information_schema @@ -1925,9 +1903,7 @@ SELECT SCHEMA_NAME from information_schema.schemata where schema_name='aaaaaaaaa SELECT SCHEMA_NAME from information_schema.schemata where schema_name=REPEAT('a',193); ---echo # --echo # End of 10.1 tests ---echo # --echo # --echo # MDEV-14836: Assertion `m_status == DA_ERROR' failed in @@ -1976,9 +1952,7 @@ CREATE TABLE `a/~.b`.t1 (a INT); SELECT TABLE_SCHEMA, TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='a/~.b'; DROP DATABASE `a/~.b`; ---echo # --echo # End of 10.2 Test ---echo # --echo # --echo # MDEV-21201:No records produced in information_schema query, @@ -2114,9 +2088,7 @@ SET SQL_MODE=DEFAULT; --echo # select progress from information_schema.processlist limit 1; ---echo # --echo # End of 10.3 tests ---echo # --echo # --echo # MDEV-MDEV-31064 Changes of the procedure are not immediatly seen in queries to I_S.parameter from other connections @@ -2136,13 +2108,7 @@ SELECT COUNT(*) FROM information_schema.parameters WHERE SPECIFIC_NAME = 'sp1'; --connection default DROP PROCEDURE sp1; ---echo # --echo # End of 10.4 tests ---echo # - ---echo # ---echo # Start of 10.5 tests ---echo # --echo # --echo # MDEV-26507 Assertion `tmp != ((long long) 0x8000000000000000LL)' failed in TIME_from_longlong_datetime_packed @@ -2160,6 +2126,4 @@ SET SESSION sql_mode=DEFAULT; DROP VIEW i; DROP TABLE t1; ---echo # --echo # End of 10.5 tests ---echo # diff --git a/mysql-test/main/information_schema_db.result b/mysql-test/main/information_schema_db.result index 869455a8708..2ce8ba14278 100644 --- a/mysql-test/main/information_schema_db.result +++ b/mysql-test/main/information_schema_db.result @@ -213,9 +213,7 @@ connection default; use test; drop view testdb_1.v1, v2, testdb_1.v3, v4; drop database testdb_1; -connection testdb_1; disconnect testdb_1; -connection testdb_2; disconnect testdb_2; connection default; drop user testdb_1@localhost; @@ -249,9 +247,7 @@ ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table ` connection default; drop user mysqltest_1@localhost; drop database testdb_1; -connection user1; disconnect user1; -connection default; 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 6ae1d00ef13..eab7f4f8a8c 100644 --- a/mysql-test/main/information_schema_db.test +++ b/mysql-test/main/information_schema_db.test @@ -206,12 +206,8 @@ connection default; use test; drop view testdb_1.v1, v2, testdb_1.v3, v4; drop database testdb_1; -connection testdb_1; disconnect testdb_1; ---source include/wait_until_disconnected.inc -connection testdb_2; disconnect testdb_2; ---source include/wait_until_disconnected.inc connection default; drop user testdb_1@localhost; drop user testdb_2@localhost; @@ -243,10 +239,7 @@ show create view testdb_1.v1; connection default; drop user mysqltest_1@localhost; drop database testdb_1; -connection user1; disconnect user1; ---source include/wait_until_disconnected.inc -connection default; set global sql_mode=default; diff --git a/mysql-test/main/information_schema_temp_table.test b/mysql-test/main/information_schema_temp_table.test index 6cce08cdc41..ab24491afce 100644 --- a/mysql-test/main/information_schema_temp_table.test +++ b/mysql-test/main/information_schema_temp_table.test @@ -4,8 +4,6 @@ --echo # INNODB_TEMP_TABLE_INFO --echo # -# Save the initial number of concurrent sessions ---source include/count_sessions.inc --source include/have_innodb.inc --echo # ------------------------------- @@ -107,9 +105,6 @@ drop table test.t_temp; drop database my_db; drop database some_db; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - --echo # --echo # MDEV-28332: Alter on temporary table causes ER_TABLE_EXISTS_ERROR note --echo # diff --git a/mysql-test/main/init_connect.test b/mysql-test/main/init_connect.test index c210ea10850..159ba46b6fa 100644 --- a/mysql-test/main/init_connect.test +++ b/mysql-test/main/init_connect.test @@ -5,9 +5,6 @@ # should work with embedded server after mysqltest is fixed --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - --source include/add_anonymous_users.inc connect (con0,localhost,root,,); @@ -259,7 +256,3 @@ set global init_connect="set @a='a\\0c'"; revoke all privileges, grant option from mysqltest1@localhost; drop user mysqltest1@localhost; drop table t1, t2; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/main/innodb_icp_debug.result b/mysql-test/main/innodb_icp_debug.result index 5a169650c8e..1f8465350e9 100644 --- a/mysql-test/main/innodb_icp_debug.result +++ b/mysql-test/main/innodb_icp_debug.result @@ -1,5 +1,4 @@ set default_storage_engine=innodb; -drop table if exists t0,t1,t2; create table t0(a int primary key); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); create table t1(a int primary key); diff --git a/mysql-test/main/innodb_mysql_lock.result b/mysql-test/main/innodb_mysql_lock.result index 6ca332018ca..0f7f40d0de6 100644 --- a/mysql-test/main/innodb_mysql_lock.result +++ b/mysql-test/main/innodb_mysql_lock.result @@ -5,7 +5,6 @@ call mtr.add_suppression("Deadlock found when trying to get lock; try restarting # # Bug #22876 Four-way deadlock # -DROP TABLE IF EXISTS t1; connect con1,localhost,root,,; connect con2,localhost,root,,; connect con3,localhost,root,,; diff --git a/mysql-test/main/innodb_mysql_lock.test b/mysql-test/main/innodb_mysql_lock.test index e61b2fde055..b0ce24fadca 100644 --- a/mysql-test/main/innodb_mysql_lock.test +++ b/mysql-test/main/innodb_mysql_lock.test @@ -5,9 +5,6 @@ call mtr.add_suppression("InnoDB: Transaction was aborted due to "); --enable_query_log -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout; set global innodb_lock_wait_timeout=300; set session innodb_lock_wait_timeout=300; @@ -18,10 +15,6 @@ call mtr.add_suppression("Deadlock found when trying to get lock; try restarting --echo # Bug #22876 Four-way deadlock --echo # ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - connect (con1,localhost,root,,); connect (con2,localhost,root,,); connect (con3,localhost,root,,); @@ -259,10 +252,4 @@ COMMIT; DROP TABLE t1; disconnect con1; - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc - set global innodb_lock_wait_timeout=@old_innodb_lock_wait_timeout; - diff --git a/mysql-test/main/innodb_mysql_lock2.test b/mysql-test/main/innodb_mysql_lock2.test index b35c23ce659..ab51e38689a 100644 --- a/mysql-test/main/innodb_mysql_lock2.test +++ b/mysql-test/main/innodb_mysql_lock2.test @@ -9,8 +9,6 @@ --source include/have_binlog_format_mixed_or_statement.inc # Original test case for bug#51263 needs partitioning. --source include/have_partition.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc --disable_query_log CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); @@ -863,8 +861,3 @@ connection default; disconnect con1; --echo # Clean-up. drop tables t1, t2; - - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/innodb_mysql_sync.test b/mysql-test/main/innodb_mysql_sync.test index 1cd64affd38..a95e0889eaf 100644 --- a/mysql-test/main/innodb_mysql_sync.test +++ b/mysql-test/main/innodb_mysql_sync.test @@ -5,9 +5,6 @@ --source include/have_partition.inc --source include/have_debug.inc --source include/have_debug_sync.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - --echo # --echo # Bug 42074 concurrent optimize table and @@ -96,7 +93,6 @@ KILL @id; SET DEBUG_SYNC= "now SIGNAL killed"; DROP TABLE t1, t2; disconnect con1; ---source include/wait_until_count_sessions.inc SET DEBUG_SYNC= "RESET"; @@ -698,8 +694,3 @@ SET DEBUG_SYNC= 'now WAIT_FOR rebuild'; SET DEBUG_SYNC= 'RESET'; DROP TABLE t1; - - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/invisible_field_grant_completely.test b/mysql-test/main/invisible_field_grant_completely.test index b27071ada56..df05af9a069 100644 --- a/mysql-test/main/invisible_field_grant_completely.test +++ b/mysql-test/main/invisible_field_grant_completely.test @@ -45,7 +45,6 @@ select * from t1; select invisible from t1; disconnect con1; ---source include/wait_until_disconnected.inc --echo --echo #Final Cleanup connection default; diff --git a/mysql-test/main/invisible_field_grant_system.test b/mysql-test/main/invisible_field_grant_system.test index 04ea5f14be1..c65cc7ab281 100644 --- a/mysql-test/main/invisible_field_grant_system.test +++ b/mysql-test/main/invisible_field_grant_system.test @@ -41,11 +41,9 @@ select * from t1; select count(row_start) from t1; disconnect con1; ---source include/wait_until_disconnected.inc --echo --echo #Cleanup ---source include/wait_until_disconnected.inc connection default; drop user user_1; drop database d; diff --git a/mysql-test/main/ipv4_as_ipv6.test b/mysql-test/main/ipv4_as_ipv6.test index 2a3ab6647ff..2ab42f62c43 100644 --- a/mysql-test/main/ipv4_as_ipv6.test +++ b/mysql-test/main/ipv4_as_ipv6.test @@ -5,9 +5,6 @@ # Can't be tested with embedded server --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - echo =============Test of '127.0.0.1' (IPv4) ===========================; let $IPv6= 127.0.0.1; --source include/ipv6_clients.inc @@ -55,6 +52,3 @@ let $IPv6= ::1; --error 2002,2006 connect (con1, $IPv6, root, , test, $MASTER_MYPORT,); --enable_query_log - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/ipv6.test b/mysql-test/main/ipv6.test index 24ab09b7083..1619cba4b37 100644 --- a/mysql-test/main/ipv6.test +++ b/mysql-test/main/ipv6.test @@ -5,9 +5,6 @@ # Can't be tested with embedded server --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - echo =============Test of '::1' ========================================; let $IPv6= ::1; --source include/ipv6_clients.inc @@ -27,6 +24,3 @@ echo =============Test of '0:0:0:0:0:0:0:1' ============================; let $IPv6= 0:0:0:0:0:0:0:1; --source include/ipv6_clients.inc --source include/ipv6.inc - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/kill-2-master.opt b/mysql-test/main/kill-2.opt similarity index 100% rename from mysql-test/main/kill-2-master.opt rename to mysql-test/main/kill-2.opt diff --git a/mysql-test/main/kill.test b/mysql-test/main/kill.test index e89bdb22cd1..b82c1713ca0 100644 --- a/mysql-test/main/kill.test +++ b/mysql-test/main/kill.test @@ -6,9 +6,7 @@ # connection does not read() from a socket, but returns control to the # application. 'mysqltest' does not handle the kill request. # - --- source include/count_sessions.inc --- source include/not_embedded.inc +--source include/not_embedded.inc --disable_service_connection @@ -221,7 +219,6 @@ drop table t2; --echo # --echo # Test kill USER --echo # ---source include/count_sessions.inc grant ALL on test.* to test@localhost; grant ALL on test.* to test2@localhost; connect (con3, localhost, test,,); @@ -246,7 +243,6 @@ connection con4; --error 2013,2006,5014 select 1; connection default; ---source include/wait_until_count_sessions.inc --echo # --echo # MDEV-4911 - add KILL query id, and add query id information to diff --git a/mysql-test/main/lock.result b/mysql-test/main/lock.result index b5f379e8575..903b5739cda 100644 --- a/mysql-test/main/lock.result +++ b/mysql-test/main/lock.result @@ -1,4 +1,3 @@ -drop table if exists t1,t2,t3; CREATE TABLE t1 ( `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY (`id`,`id2`), KEY `index_id3` (`id3`)) ENGINE=MyISAM; insert into t1 (id,id2) values (1,1),(1,2),(1,3); LOCK TABLE t1 WRITE; @@ -469,9 +468,7 @@ connection default; UNLOCK TABLES; DROP TABLE t1, t2; disconnect con2; -# # End of 6.0 tests. -# create table t1 (a int) engine=myisam; lock tables t1 write concurrent, t1 as t2 read; connect con1,localhost,root,,; diff --git a/mysql-test/main/lock.test b/mysql-test/main/lock.test index 41cc9f8061b..4ac7c36536a 100644 --- a/mysql-test/main/lock.test +++ b/mysql-test/main/lock.test @@ -4,12 +4,6 @@ --source include/have_partition.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - ---disable_warnings -drop table if exists t1,t2,t3; ---enable_warnings CREATE TABLE t1 ( `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY (`id`,`id2`), KEY `index_id3` (`id3`)) ENGINE=MyISAM; insert into t1 (id,id2) values (1,1),(1,2),(1,3); LOCK TABLE t1 WRITE; @@ -566,14 +560,8 @@ UNLOCK TABLES; DROP TABLE t1, t2; disconnect con2; - ---echo # --echo # End of 6.0 tests. ---echo # -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc # # Test concurrent lock and read locks # This gave a warning: diff --git a/mysql-test/main/lock_multi.result b/mysql-test/main/lock_multi.result index 52196d835ec..a47b4f7af78 100644 --- a/mysql-test/main/lock_multi.result +++ b/mysql-test/main/lock_multi.result @@ -1,5 +1,3 @@ -drop table if exists t1,t2; -drop DATABASE if exists mysqltest_1; connect locker,localhost,root,,; connect locker2,localhost,root,,; connect reader,localhost,root,,; diff --git a/mysql-test/main/lock_multi.test b/mysql-test/main/lock_multi.test index a9a9341b82d..bf63234c49e 100644 --- a/mysql-test/main/lock_multi.test +++ b/mysql-test/main/lock_multi.test @@ -1,11 +1,3 @@ -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -drop table if exists t1,t2; -drop DATABASE if exists mysqltest_1; ---enable_warnings - # Test to see if select will get the lock ahead of low priority update --disable_ps2_protocol @@ -759,7 +751,6 @@ connect (con2,localhost,root); LOCK TABLES v1 WRITE, t1 READ; FLUSH TABLE t1; disconnect con2; ---source include/wait_until_disconnected.inc --echo # Connection 1 connection default; @@ -781,7 +772,6 @@ connect (con2,localhost,root); LOCK TABLES t1 WRITE, v1 READ; FLUSH TABLE t1; disconnect con2; ---source include/wait_until_disconnected.inc connection default; LOCK TABLES t1 WRITE; @@ -1079,7 +1069,3 @@ connection default; disconnect con1; UNLOCK TABLES; DROP TABLE t1; - - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/lock_multi_bug38499.result b/mysql-test/main/lock_multi_bug38499.result index de552ca0872..5ce54174ee8 100644 --- a/mysql-test/main/lock_multi_bug38499.result +++ b/mysql-test/main/lock_multi_bug38499.result @@ -3,7 +3,6 @@ SET @@global.sync_frm = OFF; connect locker,localhost,root,,; connect writer,localhost,root,,; connection default; -DROP TABLE IF EXISTS t1; CREATE TABLE t1( a INT, b INT ); CREATE TABLE t2( a INT, b INT ); INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4); @@ -31,3 +30,4 @@ DROP TABLE t1,t2; disconnect locker; disconnect writer; SET @@global.sync_frm = @odl_sync_frm; +# End of 5.0 tests diff --git a/mysql-test/main/lock_multi_bug38499.test b/mysql-test/main/lock_multi_bug38499.test index 9122b453eb2..2c934d77ce5 100644 --- a/mysql-test/main/lock_multi_bug38499.test +++ b/mysql-test/main/lock_multi_bug38499.test @@ -5,9 +5,6 @@ # The test can take hours with valgrind --source include/not_valgrind.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - SET @odl_sync_frm = @@global.sync_frm; SET @@global.sync_frm = OFF; @@ -15,9 +12,6 @@ connect (locker,localhost,root,,); connect (writer,localhost,root,,); --connection default ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings CREATE TABLE t1( a INT, b INT ); CREATE TABLE t2( a INT, b INT ); INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4); @@ -224,8 +218,4 @@ DROP TABLE t1,t2; SET @@global.sync_frm = @odl_sync_frm; -# End of 5.0 tests - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - +--echo # End of 5.0 tests diff --git a/mysql-test/main/lock_multi_bug38691.test b/mysql-test/main/lock_multi_bug38691.test index 745995f6026..c5285d9c7cb 100644 --- a/mysql-test/main/lock_multi_bug38691.test +++ b/mysql-test/main/lock_multi_bug38691.test @@ -7,9 +7,6 @@ # The test can take hours with valgrind --source include/not_valgrind.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - SET @odl_sync_frm = @@global.sync_frm; SET @@global.sync_frm = OFF; @@ -142,7 +139,3 @@ DROP TABLE t1, t2, t3; --disconnect writer SET @@global.sync_frm = @odl_sync_frm; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/main/lock_sync.result b/mysql-test/main/lock_sync.result index 69958811d68..c4fa3b326fd 100644 --- a/mysql-test/main/lock_sync.result +++ b/mysql-test/main/lock_sync.result @@ -734,9 +734,6 @@ SET DEBUG_SYNC="RESET"; # # Bug#57130 crash in Item_field::print during SHOW CREATE TABLE or VIEW # -DROP TABLE IF EXISTS t1; -DROP VIEW IF EXISTS v1; -DROP FUNCTION IF EXISTS f1; CREATE TABLE t1(a INT); CREATE FUNCTION f1() RETURNS INTEGER RETURN 1; CREATE VIEW v1 AS SELECT * FROM t1 WHERE f1() = 1; @@ -851,16 +848,25 @@ CREATE VIEW v1 AS SELECT * FROM t1; SET AUTOCOMMIT=OFF; SELECT * FROM t1; a +connect con1,localhost,root,,test; DROP TRIGGER tr1; +connection default; INSERT INTO t2 SELECT * FROM t2; SELECT f() FROM t2; ERROR 42000: FUNCTION test.f does not exist +connect con2,localhost,root,,test; set debug_sync= 'after_open_table_mdl_shared signal s1'; ALTER VIEW v1 AS SELECT f() FROM t1; +connection con1; CREATE FUNCTION f() RETURNS INT RETURN 1; +connection default; set debug_sync= 'now wait_for s1'; SELECT * FROM ( SELECT * FROM v1 ) sq; COMMIT; +connection con2; +disconnect con1; +disconnect con2; +connection default; DROP VIEW v1; DROP FUNCTION IF EXISTS f; DROP TABLE t1, t2; diff --git a/mysql-test/main/lock_sync.test b/mysql-test/main/lock_sync.test index 9a51b38faf5..a24f841471f 100644 --- a/mysql-test/main/lock_sync.test +++ b/mysql-test/main/lock_sync.test @@ -12,10 +12,6 @@ # is fixed this test can't be run on embedded version of server. --source include/not_embedded.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - - --echo # --echo # Test how we handle locking in various cases when --echo # we read data from MyISAM tables. @@ -921,7 +917,6 @@ connection con1; --echo # Reaping: DROP EVENT t1 --reap disconnect con1; ---source include/wait_until_disconnected.inc connection default; DROP EVENT e2; @@ -932,12 +927,6 @@ SET DEBUG_SYNC="RESET"; --echo # Bug#57130 crash in Item_field::print during SHOW CREATE TABLE or VIEW --echo # ---disable_warnings -DROP TABLE IF EXISTS t1; -DROP VIEW IF EXISTS v1; -DROP FUNCTION IF EXISTS f1; ---enable_warnings - CREATE TABLE t1(a INT); CREATE FUNCTION f1() RETURNS INTEGER RETURN 1; CREATE VIEW v1 AS SELECT * FROM t1 WHERE f1() = 1; @@ -1028,7 +1017,6 @@ set debug_sync='RESET'; --echo # during metadata lock upgrade which happens when one tries --echo # to use LOCK TABLES ... READ LOCAL for InnoDB tables. ---enable_connect_log CREATE TABLE t1 (i INT) ENGINE=InnoDB; CREATE TABLE t2 (j INT) ENGINE=InnoDB; @@ -1074,11 +1062,6 @@ SET DEBUG_SYNC="RESET"; disconnect con1; disconnect con2; DROP TABLES t1, t2; ---disable_connect_log - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc --echo # --echo # MDEV-28567 Assertion `0' in open_tables upon function-related operation @@ -1194,7 +1177,6 @@ COMMIT; --disconnect con1 --disconnect con2 --connection default ---source include/wait_until_count_sessions.inc DROP VIEW v1; DROP FUNCTION IF EXISTS f; DROP TABLE t1, t2; diff --git a/mysql-test/main/lock_tables_lost_commit.result b/mysql-test/main/lock_tables_lost_commit.result index 769e9734c7a..d5bd9adf82e 100644 --- a/mysql-test/main/lock_tables_lost_commit.result +++ b/mysql-test/main/lock_tables_lost_commit.result @@ -1,7 +1,6 @@ connect con1,localhost,root,,; connect con2,localhost,root,,; connection con1; -DROP TABLE IF EXISTS t1; CREATE TABLE t1(a INT) ENGINE=innodb; LOCK TABLES t1 WRITE; INSERT INTO t1 VALUES(10); @@ -13,3 +12,4 @@ a DROP TABLE t1; connection default; disconnect con2; +# End of 4.1 tests diff --git a/mysql-test/main/lock_tables_lost_commit.test b/mysql-test/main/lock_tables_lost_commit.test index 754c8f3c378..d125c50167d 100644 --- a/mysql-test/main/lock_tables_lost_commit.test +++ b/mysql-test/main/lock_tables_lost_commit.test @@ -2,17 +2,11 @@ --source include/have_innodb.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (con1,localhost,root,,); connect (con2,localhost,root,,); connection con1; ---disable_warnings -DROP TABLE IF EXISTS t1; CREATE TABLE t1(a INT) ENGINE=innodb; ---enable_warnings LOCK TABLES t1 WRITE; INSERT INTO t1 VALUES(10); disconnect con1; @@ -27,7 +21,4 @@ DROP TABLE t1; connection default; disconnect con2; -# End of 4.1 tests - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +--echo # End of 4.1 tests diff --git a/mysql-test/main/lowercase_fs_off.result b/mysql-test/main/lowercase_fs_off.result index 40e608fa620..3f999b91452 100644 --- a/mysql-test/main/lowercase_fs_off.result +++ b/mysql-test/main/lowercase_fs_off.result @@ -20,6 +20,7 @@ drop user 'sample'@'localhost'; drop database if exists d1; disconnect master; connection default; +# End of 4.1 tests CREATE DATABASE d1; USE d1; CREATE TABLE T1(f1 INT); diff --git a/mysql-test/main/lowercase_fs_off.test b/mysql-test/main/lowercase_fs_off.test index 4bff916db83..ca520a488a2 100644 --- a/mysql-test/main/lowercase_fs_off.test +++ b/mysql-test/main/lowercase_fs_off.test @@ -22,16 +22,14 @@ create database d2; --error ER_DBACCESS_DENIED_ERROR create database D1; disconnect sample; ---source include/wait_until_disconnected.inc connection master; drop user 'sample'@'localhost'; drop database if exists d1; disconnect master; ---source include/wait_until_disconnected.inc connection default; -# End of 4.1 tests +--echo # End of 4.1 tests # # Bug#41049 does syntax "grant" case insensitive? diff --git a/mysql-test/main/mdl_sync.result b/mysql-test/main/mdl_sync.result index ee7a8c04bf6..6d64b967035 100644 --- a/mysql-test/main/mdl_sync.result +++ b/mysql-test/main/mdl_sync.result @@ -1,9 +1,7 @@ -SET DEBUG_SYNC= 'RESET'; connect con1,localhost,root,,test,,; connect con2,localhost,root,,test,,; connect con3,localhost,root,,test,,; connection default; -drop table if exists t1,t2,t3; create table t1 (i int); create table t2 (i int); connection: default diff --git a/mysql-test/main/mdl_sync.test b/mysql-test/main/mdl_sync.test index 1c001ef2379..53da9aa88bf 100644 --- a/mysql-test/main/mdl_sync.test +++ b/mysql-test/main/mdl_sync.test @@ -3,19 +3,8 @@ # --source include/have_debug_sync.inc --source include/have_metadata_lock_info.inc - -# We need InnoDB tables for some of the tests. --source include/have_innodb.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - - -# Clean up resources used in this test case. ---disable_warnings -SET DEBUG_SYNC= 'RESET'; ---enable_warnings - # # Test the case of when a exclusive lock request waits for a # shared lock being upgraded to a exclusive lock. @@ -27,10 +16,6 @@ connect (con3,localhost,root,,test,,); connection default; ---disable_warnings -drop table if exists t1,t2,t3; ---enable_warnings - create table t1 (i int); create table t2 (i int); @@ -4009,7 +3994,3 @@ SET debug_sync='RESET'; DROP TABLE t1; disconnect con1; - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/myisam_icp_debug.result b/mysql-test/main/myisam_icp_debug.result index cb45a0e2274..f242f30cc82 100644 --- a/mysql-test/main/myisam_icp_debug.result +++ b/mysql-test/main/myisam_icp_debug.result @@ -1,4 +1,3 @@ -drop table if exists t0,t1,t2; create table t0(a int primary key); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); create table t1(a int primary key); diff --git a/mysql-test/main/myisam_recover.test b/mysql-test/main/myisam_recover.test index 65062eb1e96..2001db6a250 100644 --- a/mysql-test/main/myisam_recover.test +++ b/mysql-test/main/myisam_recover.test @@ -1,5 +1,3 @@ ---source include/count_sessions.inc - call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired"); set @save_table_definition_cache=@@table_definition_cache; @@ -162,6 +160,3 @@ disconnect con2; --echo # Cleanup drop table t1, t2; - -# Wait till all disconnects are completed --- source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/mysql-bug41486.result b/mysql-test/main/mysql-bug41486.result index d5760dcb1b9..009e1463a4f 100644 --- a/mysql-test/main/mysql-bug41486.result +++ b/mysql-test/main/mysql-bug41486.result @@ -1,4 +1,3 @@ -DROP TABLE IF EXISTS t1; SET @old_max_allowed_packet= @@global.max_allowed_packet; SET @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024; connect con1, localhost, root,,; diff --git a/mysql-test/main/mysql-bug41486.test b/mysql-test/main/mysql-bug41486.test index e7b0acc1935..d75290285f3 100644 --- a/mysql-test/main/mysql-bug41486.test +++ b/mysql-test/main/mysql-bug41486.test @@ -11,10 +11,6 @@ -- source include/not_embedded.inc ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - # Have to change the global variable as the session variable is # read-only. SET @old_max_allowed_packet= @@global.max_allowed_packet; @@ -45,7 +41,6 @@ DROP TABLE t1; # Cleanup disconnect con1; ---source include/wait_until_disconnected.inc remove_file $outfile; connection default; SET @@global.max_allowed_packet = @old_max_allowed_packet; diff --git a/mysql-test/main/mysql-bug45236.test b/mysql-test/main/mysql-bug45236.test index efc10ed19ea..02f708cd658 100644 --- a/mysql-test/main/mysql-bug45236.test +++ b/mysql-test/main/mysql-bug45236.test @@ -39,7 +39,6 @@ DROP TABLE t1; # Cleanup disconnect con1; ---source include/wait_until_disconnected.inc remove_file $outfile; connection default; SET @@global.max_allowed_packet = @old_max_allowed_packet; diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result index 1cf877f8f96..6331386b561 100644 --- a/mysql-test/main/mysql.result +++ b/mysql-test/main/mysql.result @@ -1,6 +1,5 @@ set GLOBAL sql_mode=""; set LOCAL sql_mode=""; -drop table if exists t1,t2,t3; create table t1(a int); insert into t1 values(1); ERROR at line 9: DELIMITER must be followed by a 'delimiter' character or string diff --git a/mysql-test/main/mysql.test b/mysql-test/main/mysql.test index fd70987ab77..73436c0307f 100644 --- a/mysql-test/main/mysql.test +++ b/mysql-test/main/mysql.test @@ -7,10 +7,6 @@ set GLOBAL sql_mode=""; set LOCAL sql_mode=""; ---disable_warnings -drop table if exists t1,t2,t3; ---enable_warnings - # # Test the "delimiter" functionality # Bug#9879 diff --git a/mysql-test/main/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result index 51f8d4d199f..076dd71193a 100644 --- a/mysql-test/main/mysqlbinlog.result +++ b/mysql-test/main/mysqlbinlog.result @@ -692,7 +692,7 @@ a b connection default; DROP DATABASE mysqltest1; DROP USER untrusted@localhost; -Bug#32580 mysqlbinlog cannot read binlog event with user variables +# Bug#32580 mysqlbinlog cannot read binlog event with user variables connection default; USE test; SET BINLOG_FORMAT = STATEMENT; diff --git a/mysql-test/main/mysqlbinlog.test b/mysql-test/main/mysqlbinlog.test index 3fd6a409cac..a1b9c89fee4 100644 --- a/mysql-test/main/mysqlbinlog.test +++ b/mysql-test/main/mysqlbinlog.test @@ -374,7 +374,7 @@ connection default; DROP DATABASE mysqltest1; DROP USER untrusted@localhost; ---echo Bug#32580 mysqlbinlog cannot read binlog event with user variables +--echo # Bug#32580 mysqlbinlog cannot read binlog event with user variables # Testing that various kinds of events can be read and restored properly. diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result index cb1bbfb4a5c..8e2eb790763 100644 --- a/mysql-test/main/mysqldump.result +++ b/mysql-test/main/mysqldump.result @@ -5561,7 +5561,6 @@ DROP TABLE t1; # Bug#12809202 61854: MYSQLDUMP --SINGLE-TRANSACTION --FLUSH-LOG BREAKS # CONSISTENCY # -DROP DATABASE IF EXISTS b12809202_db; CREATE DATABASE b12809202_db; CREATE TABLE b12809202_db.t1 (c1 INT); CREATE TABLE b12809202_db.t2 (c1 INT); diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test index 78d16057413..00f54c8e6ee 100644 --- a/mysql-test/main/mysqldump.test +++ b/mysql-test/main/mysqldump.test @@ -14,9 +14,6 @@ call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); let collation=utf8mb3_unicode_ci; --source include/have_collation.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # There are tables in 'mysql' database of type innodb --source include/have_innodb.inc @@ -2386,10 +2383,6 @@ DROP TABLE t1; --echo # CONSISTENCY --echo # ---disable_warnings -DROP DATABASE IF EXISTS b12809202_db; ---enable_warnings - CREATE DATABASE b12809202_db; CREATE TABLE b12809202_db.t1 (c1 INT); CREATE TABLE b12809202_db.t2 (c1 INT); @@ -2423,9 +2416,6 @@ DROP DATABASE b12809202_db; --echo # RESET MASTER; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc - --echo # --echo # Bug#45740 MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY CAUSES RESTORE PROBLEM --echo # diff --git a/mysql-test/main/mysqltest.result b/mysql-test/main/mysqltest.result index 2e5a89763a2..7bbe7d9a6d0 100644 --- a/mysql-test/main/mysqltest.result +++ b/mysql-test/main/mysqltest.result @@ -1002,4 +1002,4 @@ SELECT 1 /* doesn't throw error */; SELECT 1 /* doesn't throw error */; 1 1 -End of tests +# End of tests diff --git a/mysql-test/main/mysqltest.test b/mysql-test/main/mysqltest.test index eb6c1bffc91..3db8e363170 100644 --- a/mysql-test/main/mysqltest.test +++ b/mysql-test/main/mysqltest.test @@ -9,16 +9,13 @@ echo $mysql_errno before test; echo $mysql_errname before test; --- source include/have_log_bin.inc +--source include/have_log_bin.inc # This test should work in embedded server after mysqltest is fixed --- source include/not_embedded.inc +--source include/not_embedded.inc # This test uses chmod, can't be run with root permissions --- source include/not_as_root.inc - -# Save the initial number of concurrent sessions ---source include/count_sessions.inc +--source include/not_as_root.inc # Some tests below connect/disconnect rapidly in a loop. This causes a race # where mysqld may not have time to register the previous disconnects before @@ -2960,10 +2957,7 @@ set sql_mode=default; SELECT 1 /* doesn't throw error */; SELECT 1 /* doesn't throw error */; ---echo End of tests - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +--echo # End of tests --disable_query_log --eval SET GLOBAL max_connections = $saved_max_connections diff --git a/mysql-test/main/not_embedded_server.test b/mysql-test/main/not_embedded_server.test index 079c0c85bcd..7e21735284c 100644 --- a/mysql-test/main/not_embedded_server.test +++ b/mysql-test/main/not_embedded_server.test @@ -89,7 +89,6 @@ SELECT MAX(key1) INTO @dummy FROM t1 WHERE f() < 1; CREATE TABLE t3 (i INT) AS SELECT MAX(key1) FROM t1 WHERE f() < 1; disconnect con1; ---source include/wait_until_disconnected.inc connection default; diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result index fa5077d8a56..a202719f02b 100644 --- a/mysql-test/main/openssl_1.result +++ b/mysql-test/main/openssl_1.result @@ -1,6 +1,5 @@ set local sql_mode=""; set global sql_mode=""; -drop table if exists t1; create table t1(f1 int); insert into t1 values (5); grant select on test.* to ssl_user1@localhost require SSL; @@ -200,7 +199,7 @@ disconnect con1; connection default; DROP USER bug42158@localhost; set global sql_mode=default; -End of 5.1 tests +# End of 5.1 tests /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/; /*!40019 SET @@session.max_delayed_threads=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; diff --git a/mysql-test/main/openssl_1.test b/mysql-test/main/openssl_1.test index ed2d6a9284a..c0cc577eb71 100644 --- a/mysql-test/main/openssl_1.test +++ b/mysql-test/main/openssl_1.test @@ -13,9 +13,6 @@ set local sql_mode=""; set global sql_mode=""; ---disable_warnings -drop table if exists t1; ---enable_warnings create table t1(f1 int); insert into t1 values (5); @@ -195,7 +192,7 @@ connection default; DROP USER bug42158@localhost; set global sql_mode=default; ---echo End of 5.1 tests +--echo # End of 5.1 tests # # MDEV-9605 mysqlbinlog does not accept ssl-ca option as expected. diff --git a/mysql-test/main/outfile.test b/mysql-test/main/outfile.test index 090872f0516..498639d8965 100644 --- a/mysql-test/main/outfile.test +++ b/mysql-test/main/outfile.test @@ -1,6 +1,4 @@ --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc # # test of into outfile|dumpfile @@ -112,6 +110,3 @@ use test; revoke all privileges on *.* from user_1@localhost; drop user user_1@localhost; drop database mysqltest; - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/overflow.result b/mysql-test/main/overflow.result index a3e93aa5cba..2b43116244c 100644 --- a/mysql-test/main/overflow.result +++ b/mysql-test/main/overflow.result @@ -4,3 +4,4 @@ drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA Got one of the listed errors connection default; disconnect con1; +# End of 4.1 tests diff --git a/mysql-test/main/overflow.test b/mysql-test/main/overflow.test index 774c43be658..6667573d5f9 100644 --- a/mysql-test/main/overflow.test +++ b/mysql-test/main/overflow.test @@ -1,6 +1,3 @@ -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (con1,localhost,root,,); connection con1; --error ER_PARSE_ERROR,ER_WRONG_DB_NAME,ER_WRONG_NAME_FOR_INDEX @@ -8,7 +5,4 @@ drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA connection default; disconnect con1; -# End of 4.1 tests - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +--echo # End of 4.1 tests diff --git a/mysql-test/main/packet.result b/mysql-test/main/packet.result index 254ad93d78e..958d127f3be 100644 --- a/mysql-test/main/packet.result +++ b/mysql-test/main/packet.result @@ -36,3 +36,4 @@ connection default; disconnect con2; set global max_allowed_packet=@max_allowed_packet; set global net_buffer_length=@net_buffer_length; +# End of 4.1 tests diff --git a/mysql-test/main/packet.test b/mysql-test/main/packet.test index 7e08a0f6c3f..e3415b28796 100644 --- a/mysql-test/main/packet.test +++ b/mysql-test/main/packet.test @@ -4,10 +4,6 @@ # swallowing them and returning an error --source include/not_windows.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - - # # Check protocol handling # @@ -50,7 +46,4 @@ disconnect con2; set global max_allowed_packet=@max_allowed_packet; set global net_buffer_length=@net_buffer_length; -# End of 4.1 tests - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +--echo # End of 4.1 tests diff --git a/mysql-test/main/partition_debug_sync.result b/mysql-test/main/partition_debug_sync.result index 635f7735e6c..74698626f5e 100644 --- a/mysql-test/main/partition_debug_sync.result +++ b/mysql-test/main/partition_debug_sync.result @@ -67,4 +67,4 @@ SET DEBUG_SYNC= 'RESET'; disconnect con1; connection default; SET DEBUG_SYNC= 'RESET'; -End of 5.1 tests +# End of 5.1 tests diff --git a/mysql-test/main/partition_debug_sync.test b/mysql-test/main/partition_debug_sync.test index bc49153f803..2e10706fbef 100644 --- a/mysql-test/main/partition_debug_sync.test +++ b/mysql-test/main/partition_debug_sync.test @@ -89,8 +89,7 @@ connection con1; SET DEBUG_SYNC= 'RESET'; disconnect con1; ---source include/wait_until_disconnected.inc connection default; SET DEBUG_SYNC= 'RESET'; ---echo End of 5.1 tests +--echo # End of 5.1 tests diff --git a/mysql-test/main/partition_symlink.result b/mysql-test/main/partition_symlink.result index a1572bed3a4..c9dc98ee856 100644 --- a/mysql-test/main/partition_symlink.result +++ b/mysql-test/main/partition_symlink.result @@ -1,5 +1,3 @@ -DROP TABLE IF EXISTS t1; -DROP DATABASE IF EXISTS mysqltest2; # # Test for WL#4445: EXCHANGE PARTITION # diff --git a/mysql-test/main/partition_symlink.test b/mysql-test/main/partition_symlink.test index 5eba9658b1c..5582a62add3 100644 --- a/mysql-test/main/partition_symlink.test +++ b/mysql-test/main/partition_symlink.test @@ -8,10 +8,6 @@ # symlinks must also work for files, not only directories # as in --skip-symbolic-links -- source include/not_windows.inc --- disable_warnings -DROP TABLE IF EXISTS t1; -DROP DATABASE IF EXISTS mysqltest2; --- enable_warnings --echo # --echo # Test for WL#4445: EXCHANGE PARTITION diff --git a/mysql-test/main/partition_sync.test b/mysql-test/main/partition_sync.test index 9b75ab79edd..f6bd3651c00 100644 --- a/mysql-test/main/partition_sync.test +++ b/mysql-test/main/partition_sync.test @@ -1,8 +1,6 @@ --source include/have_partition.inc --source include/have_debug.inc --source include/have_debug_sync.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc --echo # --echo # Bug #43867 ALTER TABLE on a partitioned table @@ -113,8 +111,3 @@ set debug_sync= 'now SIGNAL go'; --reap DROP TABLE t1; set debug_sync= 'RESET'; - - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/plugin_auth_qa_1.result b/mysql-test/main/plugin_auth_qa_1.result index d33662ab618..96ac5935524 100644 --- a/mysql-test/main/plugin_auth_qa_1.result +++ b/mysql-test/main/plugin_auth_qa_1.result @@ -62,7 +62,6 @@ user() plug_user@localhost Tables_in_test_user_db t1 -REVOKE ALL PRIVILEGES ON test_user_db.* FROM 'plug_user'; DROP USER plug_user,plug_dest; ========== test 1.2 ======================================== GRANT ALL PRIVILEGES ON test_user_db.* TO plug_user diff --git a/mysql-test/main/plugin_auth_qa_1.test b/mysql-test/main/plugin_auth_qa_1.test index 100670dc8e7..2c605a52b01 100644 --- a/mysql-test/main/plugin_auth_qa_1.test +++ b/mysql-test/main/plugin_auth_qa_1.test @@ -62,8 +62,6 @@ GRANT ALL ON test_user_db.* TO 'plug_dest'@'%'; --echo 2) --replace_result $MASTER_MYSOCK MASTER_MYSOCK --exec $MYSQL -u plug_user --password=plug_dest -e "SELECT current_user();SELECT user();USE test_user_db;CREATE TABLE t1(a int);SHOW TABLES;DROP TABLE t1;" 2>&1 -REVOKE ALL PRIVILEGES ON test_user_db.* FROM 'plug_user'; -#REVOKE ALL PRIVILEGES ON test_user_db.* FROM 'plug_dest''; DROP USER plug_user,plug_dest; --echo ========== test 1.2 ======================================== diff --git a/mysql-test/main/processlist_notembedded.result b/mysql-test/main/processlist_notembedded.result index 26f6e4f9247..c7d6657fedc 100644 --- a/mysql-test/main/processlist_notembedded.result +++ b/mysql-test/main/processlist_notembedded.result @@ -29,6 +29,4 @@ Warnings: Note 1003 select sleep(100000) KILL QUERY $con_id; disconnect con1; -# # End of 10.2 tests -# diff --git a/mysql-test/main/processlist_notembedded.test b/mysql-test/main/processlist_notembedded.test index 35cac36bb95..da5c3ba53ef 100644 --- a/mysql-test/main/processlist_notembedded.test +++ b/mysql-test/main/processlist_notembedded.test @@ -1,6 +1,5 @@ source include/have_debug_sync.inc; source include/not_embedded.inc; -source include/count_sessions.inc; --echo # --echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes @@ -54,8 +53,5 @@ source include/wait_condition.inc; evalp SHOW EXPLAIN FOR $con_id; evalp KILL QUERY $con_id; disconnect con1; -source include/wait_until_count_sessions.inc; ---echo # --echo # End of 10.2 tests ---echo # diff --git a/mysql-test/main/query_cache_notembedded.result b/mysql-test/main/query_cache_notembedded.result index f74d1368c03..c42aab40288 100644 --- a/mysql-test/main/query_cache_notembedded.result +++ b/mysql-test/main/query_cache_notembedded.result @@ -7,7 +7,6 @@ flush query cache; flush query cache; reset query cache; flush status; -drop table if exists t1, t2, t3, t11, t21; create table t1 (a int not null); insert into t1 values (1),(2),(3); create table t2 (a int not null); @@ -480,9 +479,7 @@ select 'x' a, 'y' b from d.t1, d.t2; a b drop database d; drop table t1, t2, t3; -# # End of 10.5 tests -# SET GLOBAL query_cache_size=@query_cache_size_save; SET GLOBAL query_cache_type=@query_cache_type_save; set GLOBAL sql_mode=@sql_mode_save; diff --git a/mysql-test/main/query_cache_notembedded.test b/mysql-test/main/query_cache_notembedded.test index 92d861f06d3..0a88009d997 100644 --- a/mysql-test/main/query_cache_notembedded.test +++ b/mysql-test/main/query_cache_notembedded.test @@ -1,9 +1,6 @@ -- source include/have_query_cache.inc -- source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # # Tests with query cache # @@ -20,9 +17,6 @@ flush query cache; # This crashed in some versions flush query cache; # This crashed in some versions reset query cache; flush status; ---disable_warnings -drop table if exists t1, t2, t3, t11, t21; ---enable_warnings # # FLUSH QUERY CACHE # @@ -356,12 +350,8 @@ drop database d; drop table t1, t2, t3; ---echo # --echo # End of 10.5 tests ---echo # -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc SET GLOBAL query_cache_size=@query_cache_size_save; SET GLOBAL query_cache_type=@query_cache_type_save; set GLOBAL sql_mode=@sql_mode_save; diff --git a/mysql-test/main/read_only.result b/mysql-test/main/read_only.result index 6a5793325e1..79cca3f48a0 100644 --- a/mysql-test/main/read_only.result +++ b/mysql-test/main/read_only.result @@ -1,5 +1,4 @@ set @start_read_only= @@global.read_only; -DROP TABLE IF EXISTS t1,t2,t3; create user test@localhost; grant CREATE, SELECT, DROP on *.* to test@localhost; grant ALL on test.* to test@localhost; diff --git a/mysql-test/main/read_only.test b/mysql-test/main/read_only.test index da2bb6eb625..f43ddb9d2d3 100644 --- a/mysql-test/main/read_only.test +++ b/mysql-test/main/read_only.test @@ -5,13 +5,6 @@ --source include/not_embedded.inc set @start_read_only= @@global.read_only; -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1,t2,t3; ---enable_warnings - # READ_ONLY does nothing to SUPER users # so we use a non-SUPER one: @@ -353,16 +346,12 @@ COMMIT; START TRANSACTION READ WRITE; COMMIT; disconnect con1; ---source include/wait_until_disconnected.inc connection default; DROP USER user1; SET GLOBAL read_only= 0; DROP TABLE t1; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - --echo # End of 10.0 tests --echo # diff --git a/mysql-test/main/read_only_innodb.test b/mysql-test/main/read_only_innodb.test index 59af952da8d..63f320da6a0 100644 --- a/mysql-test/main/read_only_innodb.test +++ b/mysql-test/main/read_only_innodb.test @@ -44,7 +44,6 @@ drop table table_11733 ; drop user test@localhost; disconnect con1; - # # Bug #35732: read-only blocks SELECT statements in InnoDB # @@ -102,7 +101,6 @@ DROP TABLE t1; DROP USER test@localhost; disconnect con1; - --echo # End of 5.1 tests --echo # diff --git a/mysql-test/main/rename.result b/mysql-test/main/rename.result index 43713dc6127..4c409b99911 100644 --- a/mysql-test/main/rename.result +++ b/mysql-test/main/rename.result @@ -1,5 +1,3 @@ -drop table if exists t0,t1,t2,t3,t4; -drop table if exists t0,t5,t6,t7,t8,t9,t1_1,t1_2,t9_1,t9_2; create table t0 SELECT 1,"table 1"; create table t2 SELECT 2,"table 2"; create table t3 SELECT 3,"table 3"; @@ -77,7 +75,7 @@ alter table v1 rename to v2; ERROR HY000: 'test.v1' is not of type 'BASE TABLE' drop view v1; drop table t1; -End of 5.0 tests +# End of 5.0 tests CREATE OR REPLACE TABLE t1 (a INT); CREATE OR REPLACE TABLE t2 (a INT); CREATE OR REPLACE TEMPORARY TABLE t1_tmp (b INT); diff --git a/mysql-test/main/rename.test b/mysql-test/main/rename.test index bedbcf94040..79ff728c951 100644 --- a/mysql-test/main/rename.test +++ b/mysql-test/main/rename.test @@ -2,14 +2,6 @@ # Test of rename table # ---source include/count_sessions.inc - ---disable_warnings -drop table if exists t0,t1,t2,t3,t4; -# Clear up from other tests (to ensure that SHOW TABLES below is right) -drop table if exists t0,t5,t6,t7,t8,t9,t1_1,t1_2,t9_1,t9_2; ---enable_warnings - create table t0 SELECT 1,"table 1"; create table t2 SELECT 2,"table 2"; create table t3 SELECT 3,"table 3"; @@ -91,9 +83,7 @@ alter table v1 rename to v2; drop view v1; drop table t1; ---echo End of 5.0 tests - ---source include/wait_until_count_sessions.inc +--echo # End of 5.0 tests # # Test of rename with temporary tables diff --git a/mysql-test/main/schema.test b/mysql-test/main/schema.test index b984ebb8639..8c4551198c5 100644 --- a/mysql-test/main/schema.test +++ b/mysql-test/main/schema.test @@ -4,8 +4,6 @@ # Drop mysqltest1 database, as it can left from the previous tests. # -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc --source include/default_charset.inc create schema foo; @@ -156,8 +154,3 @@ connection con2; connection default; disconnect con2; disconnect con3; - - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/show_check.test b/mysql-test/main/show_check.test index 83628a95b96..2a541558148 100644 --- a/mysql-test/main/show_check.test +++ b/mysql-test/main/show_check.test @@ -348,7 +348,6 @@ drop table t1; --error ER_DBACCESS_DENIED_ERROR drop database mysqltest; disconnect con1; ---source include/wait_until_disconnected.inc connect (con2,localhost,mysqltest_2,,"*NO-ONE*"); connection con2; @@ -361,7 +360,6 @@ drop table mysqltest.t1; --error ER_DBACCESS_DENIED_ERROR drop database mysqltest; disconnect con2; ---source include/wait_until_disconnected.inc connect (con3,localhost,mysqltest_3,,"*NO-ONE*"); connection con3; @@ -371,7 +369,6 @@ show create database mysqltest; drop table mysqltest.t1; drop database mysqltest; disconnect con3; ---source include/wait_until_disconnected.inc connection default; set names binary; @@ -908,67 +905,6 @@ DROP VIEW v1; DROP PROCEDURE p1; DROP FUNCTION f1; -# -# Part 2: check that table with non-latin1 characters are dumped/restored -# correctly. -# -# See MDEV-14651 for details -# Ensure that all needed objects are dropped. - -#set names koi8r; - -#--disable_warnings -#DROP DATABASE IF EXISTS mysqltest1; -#--enable_warnings - -# Create objects. - -#CREATE DATABASE mysqltest1; - -#use mysqltest1; - -#CREATE TABLE t1(ËÏÌÏÎËÁ1 INT); - -# Check: -# - Dump mysqltest1; - -#--let $outfile1=$MYSQLTEST_VARDIR/tmp/show_check.mysqltest1.sql - -#--source include/count_sessions.inc -#--echo -#--echo ---> Dumping mysqltest1 to outfile1 -#--exec $MYSQL_DUMP --default-character-set=latin1 --character-sets-dir=$MYSQL_SHAREDIR/charsets --databases mysqltest1 > $outfile1 -# Take care that the additional session caused by MYSQL_DUMP has disappeared. -#--source include/wait_until_count_sessions.inc - -# - Clean mysqltest1; - -#--echo -#--echo - -#DROP DATABASE mysqltest1; - -# - Restore mysqltest1; - -#--echo -#--echo - -#--source include/count_sessions.inc -#--echo ---> Restoring mysqltest1... -#--exec $MYSQL test < $outfile1 -#--remove_file $outfile1 -# Take care that the additional session caused by MYSQL has disappeared. -#--source include/wait_until_count_sessions.inc - -# - Check definition of the table. - -#SHOW CREATE TABLE mysqltest1.t1; - -# Cleanup. - -#DROP DATABASE mysqltest1; -#use test; - # # Bug#28808 log_queries_not_using_indexes variable dynamic change is ignored # @@ -1032,7 +968,6 @@ connect (con4,localhost,mysqltest_4,,mysqltest); connection con4; show create database mysqltest; disconnect con4; ---source include/wait_until_disconnected.inc connection default; delete from mysql.user where user='mysqltest_4'; delete from mysql.db where user='mysqltest_4'; @@ -1268,7 +1203,6 @@ SHOW ENGINE MYISAM STATUS; --enable_result_log disconnect conn1; ---source include/wait_until_disconnected.inc connection default; DROP USER test_u@localhost; @@ -1292,7 +1226,6 @@ connection con1; SHOW CREATE TABLE t1; disconnect con1; ---source include/wait_until_disconnected.inc connection default; UNLOCK TABLES; @@ -1364,7 +1297,6 @@ connection con1; ALTER TABLE t1 CHARACTER SET = utf8; disconnect con1; ---source include/wait_until_disconnected.inc connection default; COMMIT; @@ -1398,7 +1330,6 @@ SELECT RELEASE_LOCK('t'); --connection con1 --reap --disconnect con1 ---source include/wait_until_disconnected.inc --connection default SET NAMES latin1; diff --git a/mysql-test/main/show_explain.result b/mysql-test/main/show_explain.result index 8eab777b9fc..546db8e279e 100644 --- a/mysql-test/main/show_explain.result +++ b/mysql-test/main/show_explain.result @@ -1046,7 +1046,6 @@ a 1 2 SET debug_dbug=@old_debug; -revoke all privileges on test.* from test2@localhost; drop user test2@localhost; disconnect con2; # diff --git a/mysql-test/main/show_explain.test b/mysql-test/main/show_explain.test index d10c4eeb6fa..d6ac6a77a8e 100644 --- a/mysql-test/main/show_explain.test +++ b/mysql-test/main/show_explain.test @@ -933,7 +933,6 @@ connection con1; reap; SET debug_dbug=@old_debug; -revoke all privileges on test.* from test2@localhost; drop user test2@localhost; disconnect con2; diff --git a/mysql-test/main/skip_name_resolve.test b/mysql-test/main/skip_name_resolve.test index 0ff19092b82..705546d27f2 100644 --- a/mysql-test/main/skip_name_resolve.test +++ b/mysql-test/main/skip_name_resolve.test @@ -1,9 +1,6 @@ # Can't be tested with embedded server --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # Bug#8471 IP address with mask fail when skip-name-resolve is on CREATE USER mysqltest_1@'127.0.0.1/255.255.255.255'; GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255'; @@ -27,9 +24,6 @@ SHOW PROCESSLIST; connection default; disconnect con1; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - --echo # --echo # Bug #37168: Missing variable - skip_name_resolve --echo # diff --git a/mysql-test/main/sp-innodb.result b/mysql-test/main/sp-innodb.result index 6a4fe5146a4..ab7960160dc 100644 --- a/mysql-test/main/sp-innodb.result +++ b/mysql-test/main/sp-innodb.result @@ -1,5 +1,3 @@ -drop table if exists t1,t2; -drop procedure if exists p1; # #MDEV-6985: MariaDB crashes on stored procedure call # diff --git a/mysql-test/main/sp-innodb.test b/mysql-test/main/sp-innodb.test index e44a853e713..eb516698089 100644 --- a/mysql-test/main/sp-innodb.test +++ b/mysql-test/main/sp-innodb.test @@ -1,11 +1,6 @@ --source include/have_innodb.inc ---disable_warnings -drop table if exists t1,t2; -drop procedure if exists p1; ---enable_warnings - --echo # --echo #MDEV-6985: MariaDB crashes on stored procedure call --echo # @@ -44,9 +39,6 @@ CALL p1(); drop procedure p1; drop table t1,t2; -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - --echo --echo # --echo # BUG 16041903: CONTINUE HANDLER NOT INVOKED @@ -199,6 +191,3 @@ CALL test_proc(1); DROP PROCEDURE IF EXISTS test_proc; DROP TABLE t1, t2; - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/sp-lock.result b/mysql-test/main/sp-lock.result index 14ea248db7b..10f7f018efd 100644 --- a/mysql-test/main/sp-lock.result +++ b/mysql-test/main/sp-lock.result @@ -687,11 +687,8 @@ select @exec_count; drop procedure p1; drop function f1; set @@session.max_sp_recursion_depth=default; -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; # @@ -728,9 +725,7 @@ get_lock("test", 10) Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation p1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`() BEGIN END latin1 latin1_swedish_ci utf8mb4_uca1400_ai_ci -connection con3; disconnect con3; -connection con2; disconnect con2; connection default; DROP PROCEDURE p1; @@ -827,6 +822,4 @@ ERROR 42000: FUNCTION db1.f1 does not exist disconnect con2; connection default; DROP FUNCTION f1; -# # End of 5.5 tests -# diff --git a/mysql-test/main/sp-lock.test b/mysql-test/main/sp-lock.test index 89b0fc3bd19..5773cff60ec 100644 --- a/mysql-test/main/sp-lock.test +++ b/mysql-test/main/sp-lock.test @@ -787,18 +787,11 @@ drop procedure p1; drop function f1; set @@session.max_sp_recursion_depth=default; -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc -connection con3; disconnect con3; ---source include/wait_until_disconnected.inc connection default; - --echo # --echo # SHOW CREATE PROCEDURE p1 called from p1, after p1 was altered --echo # @@ -838,12 +831,8 @@ connection con2; --echo # Reaping: CALL p1() --reap -connection con3; disconnect con3; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc connection default; DROP PROCEDURE p1; @@ -976,19 +965,14 @@ connection con1; --echo # Reaping: DROP DATABASE db1 --reap disconnect con1; ---source include/wait_until_disconnected.inc connection con2; --echo # Reaping: ALTER FUNCTION f1 COMMENT 'test' --error ER_SP_DOES_NOT_EXIST --reap disconnect con2; ---source include/wait_until_disconnected.inc connection default; DROP FUNCTION f1; - ---echo # --echo # End of 5.5 tests ---echo # diff --git a/mysql-test/main/sp-security.result b/mysql-test/main/sp-security.result index bef9c365f8e..1bac9290b11 100644 --- a/mysql-test/main/sp-security.result +++ b/mysql-test/main/sp-security.result @@ -5,8 +5,6 @@ use test; create user user1@localhost; grant usage on *.* to user1@localhost; flush privileges; -drop table if exists t1; -drop database if exists db1_secret; create database db1_secret; create procedure db1_secret.dummy() begin end; drop procedure db1_secret.dummy; @@ -1727,7 +1725,5 @@ connection default; disconnect conn1; drop user user@localhost; drop database test_db; -# # End of 11.3 tests -# set @@global.collation_server=@save_collation_server; diff --git a/mysql-test/main/sp-security.test b/mysql-test/main/sp-security.test index 3a5a7a0e478..4708a2ca286 100644 --- a/mysql-test/main/sp-security.test +++ b/mysql-test/main/sp-security.test @@ -7,8 +7,6 @@ --source include/default_charset.inc set @@global.collation_server=@@session.collation_server; -# Save the initial number of concurrent sessions ---source include/count_sessions.inc connect (con1root,localhost,root,,); connection con1root; @@ -19,10 +17,6 @@ create user user1@localhost; grant usage on *.* to user1@localhost; flush privileges; ---disable_warnings -drop table if exists t1; -drop database if exists db1_secret; ---enable_warnings # Create our secret database create database db1_secret; @@ -1041,9 +1035,6 @@ disconnect conn1; drop user bug12602983_user@localhost; drop database mysqltest_db; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - create user u1@localhost; grant all privileges on *.* to u1@localhost with grant option; connect u1, localhost, u1; @@ -1674,8 +1665,6 @@ disconnect conn1; drop user user@localhost; drop database test_db; ---echo # --echo # End of 11.3 tests ---echo # set @@global.collation_server=@save_collation_server; diff --git a/mysql-test/main/sp-threads.result b/mysql-test/main/sp-threads.result index 886cbd812f2..9732fce1252 100644 --- a/mysql-test/main/sp-threads.result +++ b/mysql-test/main/sp-threads.result @@ -3,7 +3,6 @@ connect con2root,localhost,root,,; connect con3root,localhost,root,,; connection con1root; use test; -drop table if exists t1; create table t1 (s1 int, s2 int, s3 int); create procedure bug4934() begin diff --git a/mysql-test/main/sp-threads.test b/mysql-test/main/sp-threads.test index 7a6d1258331..27488f46260 100644 --- a/mysql-test/main/sp-threads.test +++ b/mysql-test/main/sp-threads.test @@ -5,9 +5,6 @@ # except security/privilege tests, they go to sp-security.test # -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (con1root,localhost,root,,); connect (con2root,localhost,root,,); connect (con3root,localhost,root,,); @@ -15,9 +12,6 @@ connect (con3root,localhost,root,,); connection con1root; use test; ---disable_warnings -drop table if exists t1; ---enable_warnings create table t1 (s1 int, s2 int, s3 int); delimiter //; @@ -183,19 +177,7 @@ drop procedure p1; drop procedure p2; drop table t1; - -# -# Bug#NNNN New bug synopsis -# -#--disable_warnings -#drop procedure if exists bugNNNN; -#--enable_warnings -#create procedure bugNNNN... - connection default; disconnect con1root; disconnect con2root; disconnect con3root; - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/sp_notembedded.test b/mysql-test/main/sp_notembedded.test index 9aca03fbdc5..d1ca9918494 100644 --- a/mysql-test/main/sp_notembedded.test +++ b/mysql-test/main/sp_notembedded.test @@ -4,9 +4,6 @@ set @old_concurrent_insert= @@global.concurrent_insert; set @@global.concurrent_insert= 0; -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - delimiter |; # @@ -324,5 +321,3 @@ drop user foo1@localhost; # set @@global.concurrent_insert= @old_concurrent_insert; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/sp_sync.result b/mysql-test/main/sp_sync.result index d6c170712a7..c27109b5d08 100644 --- a/mysql-test/main/sp_sync.result +++ b/mysql-test/main/sp_sync.result @@ -1,5 +1,4 @@ -Tests of synchronization of stored procedure execution. -SET DEBUG_SYNC= 'RESET'; +# Tests of synchronization of stored procedure execution. # # Bug #30977 Concurrent statement using stored function and # DROP FUNCTION breaks SBR diff --git a/mysql-test/main/sp_sync.test b/mysql-test/main/sp_sync.test index a5682fc572f..e41e4917408 100644 --- a/mysql-test/main/sp_sync.test +++ b/mysql-test/main/sp_sync.test @@ -1,18 +1,10 @@ # This test should work in embedded server after mysqltest is fixed --- source include/not_embedded.inc +--source include/not_embedded.inc ---echo Tests of synchronization of stored procedure execution. +--echo # Tests of synchronization of stored procedure execution. --source include/have_debug_sync.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - -# Clean up resources used in this test case. ---disable_warnings -SET DEBUG_SYNC= 'RESET'; ---enable_warnings - --echo # --echo # Bug #30977 Concurrent statement using stored function and --echo # DROP FUNCTION breaks SBR @@ -164,7 +156,3 @@ connection default; disconnect con3; SET DEBUG_SYNC = 'RESET'; - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/ssl-big.result b/mysql-test/main/ssl-big.result index 54c61507ade..9d6031eac47 100644 --- a/mysql-test/main/ssl-big.result +++ b/mysql-test/main/ssl-big.result @@ -1,4 +1,3 @@ -DROP TABLE IF EXISTS t1, t2; connect ssl_con,localhost,root,,,,,SSL; create table t1 (a int); disconnect ssl_con; diff --git a/mysql-test/main/ssl-big.test b/mysql-test/main/ssl-big.test index 46076e03e70..d34326c67e2 100644 --- a/mysql-test/main/ssl-big.test +++ b/mysql-test/main/ssl-big.test @@ -9,13 +9,6 @@ # This test often times out with MemorySanitizer. -- source include/not_msan.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1, t2; ---enable_warnings - # # Bug#29579 Clients using SSL can hang the server # @@ -64,8 +57,5 @@ drop table t1; connection default; disconnect ssl_con; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - ## This test file is for testing encrypted communication only, not other ## encryption routines that the SSL library happens to provide! diff --git a/mysql-test/main/ssl.test b/mysql-test/main/ssl.test index 642af380be9..785880d1052 100644 --- a/mysql-test/main/ssl.test +++ b/mysql-test/main/ssl.test @@ -2,12 +2,9 @@ # Turn on ssl between the client and server # and run a number of tests --- source include/have_ssl_communication.inc +--source include/have_ssl_communication.inc # Slow test, don't run during staging part --- source include/not_staging.inc - -# Save the initial number of concurrent sessions ---source include/count_sessions.inc +--source include/not_staging.inc --source include/default_charset.inc --source include/have_perfschema.inc @@ -37,6 +34,3 @@ select 'still connected?'; connection default; disconnect ssl_con; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/ssl_compress.test b/mysql-test/main/ssl_compress.test index 4e17beb0fba..de033d4f560 100644 --- a/mysql-test/main/ssl_compress.test +++ b/mysql-test/main/ssl_compress.test @@ -1,14 +1,11 @@ # Turn on compression between the client and server # and run a number of tests --- source include/have_ssl_communication.inc --- source include/have_compress.inc --- source include/not_staging.inc +--source include/have_ssl_communication.inc +--source include/have_compress.inc +--source include/not_staging.inc --source include/default_optimizer_switch.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS); # Check ssl turned on @@ -29,8 +26,5 @@ SHOW STATUS LIKE 'Compression'; connection default; disconnect ssl_compress_con; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - ## This test file is for testing encrypted communication only, not other ## encryption routines that the SSL library happens to provide! diff --git a/mysql-test/main/ssl_timeout.test b/mysql-test/main/ssl_timeout.test index d762ebc35a9..183fcc2c141 100644 --- a/mysql-test/main/ssl_timeout.test +++ b/mysql-test/main/ssl_timeout.test @@ -1,9 +1,6 @@ --source include/have_ssl_communication.inc --source include/slow_environ.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - --echo # connect with read timeout so SLEEP() should timeout connect (ssl_con,localhost,root,,,,,SSL read_timeout=5$_timeout_adjustment); @@ -16,6 +13,3 @@ SELECT SLEEP(600); connection default; disconnect ssl_con; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/status.test b/mysql-test/main/status.test index 769391367ca..e683bc7287d 100644 --- a/mysql-test/main/status.test +++ b/mysql-test/main/status.test @@ -4,9 +4,6 @@ # embedded server causes different stat -- source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # Disable concurrent inserts to avoid sporadic test failures as it might # affect the the value of variables used throughout the test case. set @old_concurrent_insert= @@global.concurrent_insert; @@ -439,9 +436,6 @@ SHOW STATUS LIKE 'Feature_json'; set @@global.concurrent_insert= @old_concurrent_insert; SET GLOBAL log_output = @old_log_output; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc - --echo # --echo # MDEV-30543 New status variable: Max_used_connections_time --echo # diff --git a/mysql-test/main/status_bug17954.test b/mysql-test/main/status_bug17954.test index 75c9ab27dfd..e13b2297c44 100644 --- a/mysql-test/main/status_bug17954.test +++ b/mysql-test/main/status_bug17954.test @@ -4,9 +4,6 @@ # embedded server causes different stat -- source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # Disable concurrent inserts to avoid sporadic test failures as it might # affect the the value of variables used throughout the test case. set @old_concurrent_insert= @@global.concurrent_insert; @@ -45,7 +42,3 @@ DROP VIEW v1; --connection default set @@global.concurrent_insert= @old_concurrent_insert; SET GLOBAL log_output = @old_log_output; - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/main/synchronization.result b/mysql-test/main/synchronization.result index 302366657e8..af8399a2e65 100644 --- a/mysql-test/main/synchronization.result +++ b/mysql-test/main/synchronization.result @@ -1,4 +1,3 @@ -DROP TABLE IF EXISTS t1,t2; connect con1,localhost,root,,; connect con2,localhost,root,,; CREATE TABLE t1 (x1 INT); @@ -216,3 +215,4 @@ DROP TABLE t1; connection default; disconnect con1; disconnect con2; +# End of 4.1 tests diff --git a/mysql-test/main/synchronization.test b/mysql-test/main/synchronization.test index aef06245717..399a0f0405c 100644 --- a/mysql-test/main/synchronization.test +++ b/mysql-test/main/synchronization.test @@ -1,15 +1,8 @@ -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # # Test for Bug#2385 CREATE TABLE LIKE lacks locking on source and destination # table # ---disable_warnings -DROP TABLE IF EXISTS t1,t2; ---enable_warnings - connect (con1,localhost,root,,); connect (con2,localhost,root,,); @@ -44,7 +37,4 @@ connection default; disconnect con1; disconnect con2; -# End of 4.1 tests - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +--echo # End of 4.1 tests diff --git a/mysql-test/main/timezone_grant.result b/mysql-test/main/timezone_grant.result index 6d9872448a7..a11405f9e58 100644 --- a/mysql-test/main/timezone_grant.result +++ b/mysql-test/main/timezone_grant.result @@ -1,5 +1,3 @@ -drop tables if exists t1, t2; -drop view if exists v1; delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.db where user like 'mysqltest\_%'; delete from mysql.tables_priv where user like 'mysqltest\_%'; @@ -90,3 +88,4 @@ connection default; disconnect tzuser3; drop table t1; drop user mysqltest_1@localhost; +# End of 5.0 tests diff --git a/mysql-test/main/timezone_grant.test b/mysql-test/main/timezone_grant.test index a6dd6be695e..d4f726dfd54 100644 --- a/mysql-test/main/timezone_grant.test +++ b/mysql-test/main/timezone_grant.test @@ -1,14 +1,6 @@ # Embedded server testing does not support grants -- source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -drop tables if exists t1, t2; -drop view if exists v1; ---enable_warnings - # # Test for Bug#6116 SET time_zone := ... requires access to mysql.time_zone tables # We should allow implicit access to time zone description tables even for @@ -120,7 +112,4 @@ disconnect tzuser3; drop table t1; drop user mysqltest_1@localhost; -# End of 5.0 tests - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc +--echo # End of 5.0 tests diff --git a/mysql-test/main/trans_read_only.test b/mysql-test/main/trans_read_only.test index d8c2f20b6a9..668fc58fc33 100644 --- a/mysql-test/main/trans_read_only.test +++ b/mysql-test/main/trans_read_only.test @@ -16,7 +16,6 @@ SELECT @@transaction_read_only; SET SESSION TRANSACTION READ WRITE; SELECT @@transaction_read_only; disconnect con1; ---source include/wait_until_disconnected.inc connection default; SELECT @@transaction_read_only; diff --git a/mysql-test/main/trigger-trans.result b/mysql-test/main/trigger-trans.result index 16cb1d0bcfa..0f381bee886 100644 --- a/mysql-test/main/trigger-trans.result +++ b/mysql-test/main/trigger-trans.result @@ -1,4 +1,3 @@ -drop table if exists t1; create table t1 (a varchar(16), b int) engine=innodb; create trigger t1_bi before insert on t1 for each row begin @@ -240,6 +239,4 @@ CREATE TRIGGER tr16 AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t1 VALUES (1); SET max_statement_time= default; DROP TRIGGER IF EXISTS trg16; DROP TABLE t1; -# # End of 10.5 tests -# diff --git a/mysql-test/main/trigger-trans.test b/mysql-test/main/trigger-trans.test index d542b6120aa..d94ca0a42c5 100644 --- a/mysql-test/main/trigger-trans.test +++ b/mysql-test/main/trigger-trans.test @@ -2,13 +2,6 @@ # (or just InnoDB storage engine) --source include/have_innodb.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -drop table if exists t1; ---enable_warnings - # Test for bug #18153 "OPTIMIZE/ALTER on transactional tables corrupt # triggers/triggers are lost". @@ -229,14 +222,10 @@ INSERT INTO t2 (id) VALUES (1); # Cleanup disconnect con2; ---source include/wait_until_disconnected.inc connection default; DROP TABLE t3, t2, t1; -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc - --echo # --echo # MDEV-25738 Assertion `ticket->m_duration == MDL_EXPLICIT' failed in --echo # void MDL_context::release_lock(MDL_ticket*) @@ -255,6 +244,4 @@ DROP TRIGGER IF EXISTS trg16; --enable_warnings DROP TABLE t1; ---echo # --echo # End of 10.5 tests ---echo # diff --git a/mysql-test/main/trigger_notembedded.result b/mysql-test/main/trigger_notembedded.result index 9023c637006..32b8696a7ef 100644 --- a/mysql-test/main/trigger_notembedded.result +++ b/mysql-test/main/trigger_notembedded.result @@ -3,7 +3,6 @@ DELETE FROM mysql.db WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%'; FLUSH PRIVILEGES; -DROP DATABASE IF EXISTS mysqltest_db1; CREATE DATABASE mysqltest_db1; CREATE USER mysqltest_dfn@localhost; CREATE USER mysqltest_inv@localhost; @@ -177,7 +176,6 @@ DELETE FROM mysql.db WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%'; FLUSH PRIVILEGES; -DROP DATABASE IF EXISTS mysqltest_db1; CREATE DATABASE mysqltest_db1; use mysqltest_db1; CREATE TABLE t1(col CHAR(20)); @@ -352,7 +350,6 @@ DELETE FROM mysql.db WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%'; FLUSH PRIVILEGES; -DROP DATABASE IF EXISTS mysqltest_db1; CREATE DATABASE mysqltest_db1; USE mysqltest_db1; CREATE TABLE t1 (i1 INT); @@ -509,7 +506,6 @@ DROP TABLE t1,t2; SET SESSION LOW_PRIORITY_UPDATES=DEFAULT; SET GLOBAL LOW_PRIORITY_UPDATES=DEFAULT; End of 5.0 tests. -drop table if exists t1; create table t1 (i int); connect flush,localhost,root,,test,,; connection default; @@ -543,7 +539,6 @@ connection default; disconnect con1; DROP USER 'no_rights'@'localhost'; DROP DATABASE db1; -DROP DATABASE IF EXISTS mysqltest_db1; CREATE DATABASE mysqltest_db1; USE mysqltest_db1; CREATE USER mysqltest_u1@localhost; @@ -569,7 +564,7 @@ DROP USER mysqltest_u1@localhost; disconnect con1; connection default; USE test; -End of 5.1 tests. +# End of 5.1 tests. # # MDEV-34551: Column list in the trigger definition # diff --git a/mysql-test/main/trigger_notembedded.test b/mysql-test/main/trigger_notembedded.test index 4afef5135db..fa29b2175fc 100644 --- a/mysql-test/main/trigger_notembedded.test +++ b/mysql-test/main/trigger_notembedded.test @@ -35,10 +35,6 @@ DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%'; FLUSH PRIVILEGES; ---disable_warnings -DROP DATABASE IF EXISTS mysqltest_db1; ---enable_warnings - CREATE DATABASE mysqltest_db1; CREATE USER mysqltest_dfn@localhost; @@ -375,10 +371,6 @@ DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%'; FLUSH PRIVILEGES; ---disable_warnings -DROP DATABASE IF EXISTS mysqltest_db1; ---enable_warnings - CREATE DATABASE mysqltest_db1; use mysqltest_db1; @@ -660,10 +652,6 @@ DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%'; FLUSH PRIVILEGES; ---disable_warnings -DROP DATABASE IF EXISTS mysqltest_db1; ---enable_warnings - CREATE DATABASE mysqltest_db1; USE mysqltest_db1; @@ -898,9 +886,6 @@ SET GLOBAL LOW_PRIORITY_UPDATES=DEFAULT; # Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock # ---disable_warnings -drop table if exists t1; ---enable_warnings create table t1 (i int); connect (flush,localhost,root,,test,,); connection default; @@ -952,10 +937,6 @@ DROP DATABASE db1; # - active SELECT statement during trigger execution # (i.e. LEX::current_select != NULL); # - IGNORE option (i.e. LEX::current_select->no_error == TRUE); ---disable_warnings -DROP DATABASE IF EXISTS mysqltest_db1; ---enable_warnings - CREATE DATABASE mysqltest_db1; USE mysqltest_db1; @@ -989,12 +970,11 @@ UPDATE IGNORE t1, t2 SET t1.a1 = 2, t2.a1 = 3 WHERE t1.a1 = 1 AND t2.a1 = 2; DROP DATABASE mysqltest_db1; DROP USER mysqltest_u1@localhost; - --disconnect con1 --connection default USE test; ---echo End of 5.1 tests. +--echo # End of 5.1 tests. --echo # --echo # MDEV-34551: Column list in the trigger definition diff --git a/mysql-test/main/truncate_coverage.test b/mysql-test/main/truncate_coverage.test index 1b793c6638c..2c373746258 100644 --- a/mysql-test/main/truncate_coverage.test +++ b/mysql-test/main/truncate_coverage.test @@ -95,13 +95,11 @@ connection con1; --error ER_WRONG_MRG_TABLE --reap disconnect con1; ---source include/wait_until_disconnected.inc connection con2; --echo # Reaping: FLUSH TABLES --reap disconnect con2; ---source include/wait_until_disconnected.inc connection default; SET DEBUG_SYNC= 'RESET'; diff --git a/mysql-test/main/user_limits.result b/mysql-test/main/user_limits.result index 1cb4f9c03e8..0094086045d 100644 --- a/mysql-test/main/user_limits.result +++ b/mysql-test/main/user_limits.result @@ -1,5 +1,4 @@ set @my_max_user_connections= @@global.max_user_connections; -drop table if exists t1; create table t1 (i int); delete from mysql.user where user like 'mysqltest\_%'; delete from mysql.db where user like 'mysqltest\_%'; @@ -188,10 +187,8 @@ connection default; drop user mysqltest_1@localhost; drop table t1; set global max_user_connections= @my_max_user_connections; -# # End of 10.1 tests # -# # MDEV-17852 Altered connection limits for user have no effect # create user foo@'%' with max_user_connections 1; @@ -212,6 +209,4 @@ disconnect con3; disconnect con1; connection default; drop user foo@'%'; -# # End of 10.2 tests -# diff --git a/mysql-test/main/user_limits.test b/mysql-test/main/user_limits.test index fcc244302cd..f60077805c1 100644 --- a/mysql-test/main/user_limits.test +++ b/mysql-test/main/user_limits.test @@ -5,15 +5,9 @@ # Requires privileges to be enabled --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - set @my_max_user_connections= @@global.max_user_connections; # Prepare play-ground ---disable_warnings -drop table if exists t1; ---enable_warnings create table t1 (i int); # Just be sure that nothing will bother us delete from mysql.user where user like 'mysqltest\_%'; @@ -212,14 +206,9 @@ drop user mysqltest_1@localhost; # Final cleanup drop table t1; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - set global max_user_connections= @my_max_user_connections; ---echo # --echo # End of 10.1 tests ---echo # --echo # --echo # MDEV-17852 Altered connection limits for user have no effect @@ -239,6 +228,4 @@ select current_user(); --connection default drop user foo@'%'; ---echo # --echo # End of 10.2 tests ---echo # diff --git a/mysql-test/main/userstat-badlogin-4824.test b/mysql-test/main/userstat-badlogin-4824.test index 96b4368a707..fd870f8b831 100644 --- a/mysql-test/main/userstat-badlogin-4824.test +++ b/mysql-test/main/userstat-badlogin-4824.test @@ -24,8 +24,8 @@ connection default; let $wait_condition= select count(*) = 1 from information_schema.processlist; --source include/wait_condition.inc -# 41 is for ps-procotol ---replace_result 41 18 +# 32 is for ps-procotol +--replace_result 32 18 select user, bytes_received from information_schema.user_statistics where user = 'foo'; --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT @@ -34,7 +34,7 @@ connect(foo, localhost, foo, bar, test); connection default; ---replace_result 41 18 +--replace_result 32 18 select user, bytes_received from information_schema.user_statistics where user = 'foo'; --enable_ps2_protocol diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index 287be34e27d..a1c1a2e71a2 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -2900,10 +2900,7 @@ connection root; SELECT * FROM t1; x 1 -REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user21261'@'localhost'; DROP USER 'user21261'@'localhost'; -DROP VIEW v1; -DROP TABLE t1; DROP DATABASE bug21261DB; connection default; USE test; @@ -7141,7 +7138,5 @@ INSERT INTO view1(x1,x) VALUES (1,1); ERROR HY000: The target table view1 of the INSERT is not insertable-into DROP VIEW view1; DROP TABLE table1; -# # End of 10.11 test -# ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci; diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index 546fb5a9b2f..99c248d0374 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -1,6 +1,4 @@ --source include/have_partition.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc --source include/default_optimizer_switch.inc --source include/have_innodb.inc --source include/test_db_charset_latin1.inc @@ -2771,12 +2769,8 @@ connection user21261; UPDATE v1,t2 SET x=1 WHERE x=y; connection root; SELECT * FROM t1; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user21261'@'localhost'; DROP USER 'user21261'@'localhost'; -DROP VIEW v1; -DROP TABLE t1; DROP DATABASE bug21261DB; - connection default; USE test; disconnect root; @@ -4763,11 +4757,6 @@ CREATE VIEW v4 AS --echo # Cleanup DROP VIEW v1, v2, v3; - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc - --echo # --echo # lp:833600 Wrong result with view + outer join + uncorrelated subquery (non-semijoin) --echo # @@ -6902,8 +6891,6 @@ INSERT INTO view1(x1,x) VALUES (1,1); DROP VIEW view1; DROP TABLE table1; ---echo # --echo # End of 10.11 test ---echo # --source include/test_db_charset_restore.inc diff --git a/mysql-test/main/view_grant.result b/mysql-test/main/view_grant.result index 196bd6bda07..ffebe4f6399 100644 --- a/mysql-test/main/view_grant.result +++ b/mysql-test/main/view_grant.result @@ -1,5 +1,3 @@ -drop database if exists mysqltest; -drop view if exists v1,v2,v3; create user test@localhost; grant create view on test.* to test@localhost; show grants for test@localhost; @@ -57,7 +55,6 @@ c select d from mysqltest.v1; ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'd' in table 'v1' connection root; -revoke all privileges on mysqltest.v1 from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; create database mysqltest; @@ -72,7 +69,6 @@ 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; -revoke all privileges on mysqltest.v1 from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; connection root; @@ -193,11 +189,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; -revoke all privileges on mysqltest.* from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; -connection root; 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); @@ -256,11 +250,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; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; -connection root; 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); @@ -290,10 +282,8 @@ delete from v2 where c < 4; ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2` connection root; disconnect user1; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; -connection root; create database mysqltest; create table mysqltest.t1 (a int, b int, primary key(a)); insert into mysqltest.t1 values (1,2), (2,3); @@ -324,7 +314,6 @@ 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; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; @@ -366,12 +355,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; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; drop view v1,v2,v4; disconnect user1; -connection root; create database mysqltest; create table mysqltest.t1 (a int); create user mysqltest_1@localhost; @@ -379,11 +366,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; -revoke all privileges on mysqltest.* from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; -connection root; create database mysqltest; create table mysqltest.t1 (a int, b int); create user mysqltest_1@localhost; @@ -401,18 +386,15 @@ 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 -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop view v1; drop database mysqltest; disconnect user1; -connection root; create database mysqltest; use mysqltest; create table t1 (a int); insert into t1 values (1); create table t2 (s1 int); -drop function if exists f2; create function f2 () returns int begin declare v int; select s1 from t2 into v; return v; end// create algorithm=TEMPTABLE view v1 as select f2() from t1; @@ -440,21 +422,15 @@ 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; -drop view v1, v2, v3, v4, v5; -drop function f2; -drop table t1, t2; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; +use test; disconnect user1; -connection root; create database mysqltest; use mysqltest; create table t1 (a int); insert into t1 values (1); create table t2 (s1 int); -drop function if exists f2; create function f2 () returns int begin declare v int; select s1 from t2 into v; return v; end// create user mysqltest_1@localhost; @@ -481,15 +457,10 @@ 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 -drop view v1, v2, v3, v4, v5; -drop function f2; -drop table t1, t2; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; -connection root; +use test; create database mysqltest; use mysqltest; create table t1 (a int); @@ -520,13 +491,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 -drop table t1; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; -connection root; create database mysqltest; use mysqltest; create table t1 (a int); @@ -556,12 +523,9 @@ 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; -drop view v1, v2, v3, v4, v5; -drop table t1; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; +use test; disconnect user1; create user 'test14256'@'%'; grant all on test.* to 'test14256'@'%'; @@ -588,7 +552,6 @@ test14256@% test14256@% 1 connection root; disconnect test14256; drop user test14256; -connection root; create database mysqltest; use mysqltest; CREATE TABLE t1 (i INT); @@ -604,9 +567,9 @@ SHOW CREATE TABLE v1; ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1` UNLOCK TABLES; connection root; -use test; drop user mysqltest_1@localhost; drop database mysqltest; +use test; disconnect user1; disconnect root; connection default; @@ -758,12 +721,6 @@ DROP VIEW test2.t3; DROP TABLE test2.t1, test1.t0; DROP DATABASE test2; DROP DATABASE test1; -DROP VIEW IF EXISTS v1; -DROP VIEW IF EXISTS v2; -DROP VIEW IF EXISTS v3; -DROP FUNCTION IF EXISTS f1; -DROP FUNCTION IF EXISTS f2; -DROP PROCEDURE IF EXISTS p1; CREATE SQL SECURITY DEFINER VIEW v1 AS SELECT CURRENT_USER() AS cu; CREATE FUNCTION f1() RETURNS VARCHAR(77) SQL SECURITY INVOKER RETURN CURRENT_USER(); @@ -860,8 +817,6 @@ ERROR HY000: The user specified as a definer ('def_17254'@'localhost') does not DROP USER inv_17254@localhost; DROP DATABASE db17254; disconnect def; -DROP DATABASE IF EXISTS mysqltest_db1; -DROP DATABASE IF EXISTS mysqltest_db2; DROP USER mysqltest_u1; DROP USER mysqltest_u2; CREATE USER mysqltest_u1@localhost; @@ -986,8 +941,6 @@ DROP DATABASE mysqltest_29908; disconnect u1; disconnect u2; ####################################################################### -DROP DATABASE IF EXISTS mysqltest1; -DROP DATABASE IF EXISTS mysqltest2; CREATE DATABASE mysqltest1; CREATE DATABASE mysqltest2; CREATE TABLE mysqltest1.t1(c1 INT); @@ -1356,10 +1309,8 @@ select * from information_schema.table_privileges; GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PRIVILEGE_TYPE IS_GRANTABLE 'mariadb.sys'@'localhost' def mysql global_priv SELECT NO 'mariadb.sys'@'localhost' def mysql global_priv DELETE NO -End of 5.0 tests. +# End of 5.0 tests. connection default; -DROP VIEW IF EXISTS v1; -DROP TABLE IF EXISTS t1; CREATE TABLE t1 (i INT); CREATE VIEW v1 AS SELECT * FROM t1; ALTER VIEW v1 AS SELECT * FROM t1; @@ -1677,7 +1628,6 @@ USE test; # # Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing definer # -DROP VIEW IF EXISTS v1; CREATE DEFINER=`unknown`@`unknown` SQL SECURITY DEFINER VIEW v1 AS SELECT 1; Warnings: Note 1446 The user specified as a definer ('unknown'@'unknown') does not exist @@ -1690,7 +1640,6 @@ DROP VIEW v1; # # Check that we correctly handle privileges for various combinations # of INVOKER and DEFINER-security views using each other. -DROP DATABASE IF EXISTS mysqltest1; CREATE DATABASE mysqltest1; USE mysqltest1; CREATE TABLE t1 (i INT); @@ -1803,8 +1752,6 @@ DROP USER 'mysqluser2'@'%'; # Test for bug #11766767 - "59957: VIEW USING MERGE PERMISSIONS # IN MULTI-TABLE UPDATE". # -drop database if exists mysqltest1; -drop database if exists mysqltest2; # # Prepare playground. create database mysqltest1; diff --git a/mysql-test/main/view_grant.test b/mysql-test/main/view_grant.test index 59eb5f4022f..0e220b77b04 100644 --- a/mysql-test/main/view_grant.test +++ b/mysql-test/main/view_grant.test @@ -1,15 +1,6 @@ # Can't test with embedded server -- source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -drop database if exists mysqltest; -drop view if exists v1,v2,v3; ---enable_warnings - - # simple test of grants create user test@localhost; grant create view on test.* to test@localhost; @@ -23,9 +14,7 @@ drop user test@localhost; # connect (root,localhost,root,,test); connection root; ---disable_warnings create database mysqltest; ---enable_warnings create table mysqltest.t1 (a int, b int); create table mysqltest.t2 (a int, b int); @@ -77,10 +66,7 @@ disconnect user1; # grants per columns # # MERGE algorithm ---disable_warnings create database mysqltest; ---enable_warnings - create table mysqltest.t1 (a int, b int); create view mysqltest.v1 (c,d) as select a+1,b+1 from mysqltest.t1; grant select (c) on mysqltest.v1 to mysqltest_1@localhost; @@ -92,15 +78,11 @@ select c from mysqltest.v1; select d from mysqltest.v1; connection root; -revoke all privileges on mysqltest.v1 from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; # TEMPORARY TABLE algorithm ---disable_warnings create database mysqltest; ---enable_warnings - 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; @@ -114,7 +96,6 @@ select d from mysqltest.v1; connection root; disconnect user1; -revoke all privileges on mysqltest.v1 from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; @@ -122,9 +103,7 @@ drop database mysqltest; # EXPLAIN rights # connection root; ---disable_warnings create database mysqltest; ---enable_warnings # prepare views and tables create table mysqltest.t1 (a int, b int); create table mysqltest.t2 (a int, b int); @@ -232,7 +211,6 @@ explain select c from mysqltest.v4; show create view mysqltest.v4; connection root; -revoke all privileges on mysqltest.* from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; @@ -240,11 +218,7 @@ disconnect user1; # # UPDATE privileges on VIEW columns and whole VIEW # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings - 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); create table mysqltest.t2 (x int); @@ -286,7 +260,6 @@ update t2,v3 set v3.a=v3.a+v3.c where t2.x=v3.c; update v3 set a=a+c; connection root; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; @@ -294,11 +267,7 @@ disconnect user1; # # DELETE privileges on VIEW # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings - 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); create table mysqltest.t2 (x int); @@ -325,18 +294,13 @@ delete from v2 where c < 4; connection root; disconnect user1; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; # # insert privileges on VIEW # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings - create table mysqltest.t1 (a int, b int, primary key(a)); insert into mysqltest.t1 values (1,2), (2,3); create table mysqltest.t2 (x int, y int); @@ -362,7 +326,6 @@ insert into v2 values (5,6); insert into v2 select x,y from t2; connection root; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; @@ -371,10 +334,7 @@ disconnect user1; # test of CREATE VIEW privileges if we have limited privileges # connection root; ---disable_warnings create database mysqltest; ---enable_warnings - create table mysqltest.t1 (a int, b int); create table mysqltest.t2 (a int, b int); @@ -426,7 +386,6 @@ connection user1; create view v4 as select b+1 from mysqltest.t2; connection root; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; drop view v1,v2,v4; @@ -435,10 +394,7 @@ disconnect user1; # # user with global DB privileges # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings create table mysqltest.t1 (a int); create user mysqltest_1@localhost; grant all privileges on mysqltest.* to mysqltest_1@localhost; @@ -447,7 +403,6 @@ connect (user1,localhost,mysqltest_1,,mysqltest); create view v1 as select * from t1; connection root; -revoke all privileges on mysqltest.* from mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; @@ -455,11 +410,7 @@ disconnect user1; # # view definer grants revoking # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings - create table mysqltest.t1 (a int, b int); create user mysqltest_1@localhost; @@ -478,7 +429,7 @@ revoke select on mysqltest.t1 from mysqltest_1@localhost; select * from v1; grant select on mysqltest.t1 to mysqltest_1@localhost; select * from v1; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; + drop user mysqltest_1@localhost; drop view v1; drop database mysqltest; @@ -487,18 +438,12 @@ disconnect user1; # # rights on execution of view underlying functions (Bug#9505) # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings use mysqltest; create table t1 (a int); insert into t1 values (1); create table t2 (s1 int); ---disable_warnings -drop function if exists f2; ---enable_warnings --enable_prepare_warnings delimiter //; create function f2 () returns int begin declare v int; select s1 from t2 @@ -528,13 +473,9 @@ select * from v4; select * from v5; connection root; -drop view v1, v2, v3, v4, v5; -drop function f2; -drop table t1, t2; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; +use test; disconnect user1; # @@ -542,18 +483,12 @@ disconnect user1; # function # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings use mysqltest; create table t1 (a int); insert into t1 values (1); create table t2 (s1 int); ---disable_warnings -drop function if exists f2; ---enable_warnings --enable_prepare_warnings delimiter //; create function f2 () returns int begin declare v int; select s1 from t2 @@ -583,22 +518,15 @@ select * from v4; --error ER_VIEW_INVALID select * from v5; -drop view v1, v2, v3, v4, v5; -drop function f2; -drop table t1, t2; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; +use test; disconnect user1; # # definer/invoker rights for columns # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings use mysqltest; create table t1 (a int); @@ -628,19 +556,11 @@ select * from v4; --error ER_VIEW_INVALID select * from v5; -#drop view v1, v2, v3, v4, v5; -drop table t1; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; disconnect user1; - -connection root; ---disable_warnings create database mysqltest; ---enable_warnings use mysqltest; create table t1 (a int); @@ -668,12 +588,9 @@ select * from v4; select * from v5; connection root; -drop view v1, v2, v3, v4, v5; -drop table t1; -use test; -REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost; drop user mysqltest_1@localhost; drop database mysqltest; +use test; disconnect user1; # @@ -716,10 +633,7 @@ drop user test14256; # Bug#14726 freeing stack variable in case of an error of opening a view when # we have locked tables with LOCK TABLES statement. # -connection root; ---disable_warnings create database mysqltest; ---enable_warnings use mysqltest; CREATE TABLE t1 (i INT); @@ -736,9 +650,9 @@ SHOW CREATE TABLE v1; UNLOCK TABLES; connection root; -use test; drop user mysqltest_1@localhost; drop database mysqltest; +use test; # # switch to default connection @@ -897,10 +811,8 @@ DROP USER mysqltest_db1@localhost; # Bug#20482 failure on Create join view with sources views/tables # in different schemas # ---disable_warnings CREATE DATABASE test1; CREATE DATABASE test2; ---enable_warnings CREATE TABLE test1.t0 (a VARCHAR(20)); CREATE TABLE test2.t1 (a VARCHAR(20)); @@ -919,15 +831,6 @@ DROP DATABASE test1; # Bug#20570 CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returns # invoker name # ---disable_warnings -DROP VIEW IF EXISTS v1; -DROP VIEW IF EXISTS v2; -DROP VIEW IF EXISTS v3; -DROP FUNCTION IF EXISTS f1; -DROP FUNCTION IF EXISTS f2; -DROP PROCEDURE IF EXISTS p1; ---enable_warnings - CREATE SQL SECURITY DEFINER VIEW v1 AS SELECT CURRENT_USER() AS cu; CREATE FUNCTION f1() RETURNS VARCHAR(77) SQL SECURITY INVOKER @@ -1029,10 +932,6 @@ disconnect def; # # Bug#24404 strange bug with view+permission+prepared statement # ---disable_warnings -DROP DATABASE IF EXISTS mysqltest_db1; -DROP DATABASE IF EXISTS mysqltest_db2; ---enable_warnings --error 0,ER_CANNOT_USER DROP USER mysqltest_u1; --error 0,ER_CANNOT_USER @@ -1178,11 +1077,6 @@ disconnect u2; # Prepare. ---disable_warnings -DROP DATABASE IF EXISTS mysqltest1; -DROP DATABASE IF EXISTS mysqltest2; ---enable_warnings - CREATE DATABASE mysqltest1; CREATE DATABASE mysqltest2; @@ -1633,17 +1527,12 @@ connection default; #verify that no privileges were left after the above select * from information_schema.table_privileges; ---echo End of 5.0 tests. - +--echo # End of 5.0 tests. # # Test that ALTER VIEW accepts DEFINER and ALGORITHM, see bug#16425. # connection default; ---disable_warnings -DROP VIEW IF EXISTS v1; -DROP TABLE IF EXISTS t1; ---enable_warnings CREATE TABLE t1 (i INT); CREATE VIEW v1 AS SELECT * FROM t1; @@ -1932,10 +1821,6 @@ USE test; --echo # Bug#47734: Assertion failed: ! is_set() when locking a view with non-existing definer --echo # ---disable_warnings -DROP VIEW IF EXISTS v1; ---enable_warnings - CREATE DEFINER=`unknown`@`unknown` SQL SECURITY DEFINER VIEW v1 AS SELECT 1; --error ER_MALFORMED_DEFINER LOCK TABLES v1 READ; @@ -1948,9 +1833,6 @@ DROP VIEW v1; --echo # --echo # Check that we correctly handle privileges for various combinations --echo # of INVOKER and DEFINER-security views using each other. ---disable_warnings -DROP DATABASE IF EXISTS mysqltest1; ---enable_warnings CREATE DATABASE mysqltest1; USE mysqltest1; CREATE TABLE t1 (i INT); @@ -2055,10 +1937,6 @@ DROP USER 'mysqluser2'@'%'; --echo # Test for bug #11766767 - "59957: VIEW USING MERGE PERMISSIONS --echo # IN MULTI-TABLE UPDATE". --echo # ---disable_warnings -drop database if exists mysqltest1; -drop database if exists mysqltest2; ---enable_warnings --echo # --echo # Prepare playground. create database mysqltest1; @@ -2306,6 +2184,3 @@ disconnect con1; drop user foo@localhost; drop schema foo; --echo # End of 10.6 tests - -# Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/main/wait_timeout.test b/mysql-test/main/wait_timeout.test index f7289ceed1f..6433431b3f6 100644 --- a/mysql-test/main/wait_timeout.test +++ b/mysql-test/main/wait_timeout.test @@ -10,9 +10,6 @@ -- source include/not_embedded.inc #-- source include/one_thread_per_connection.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # # Bug#8731 wait_timeout does not work on Mac OS X # @@ -136,8 +133,3 @@ let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err; let SEARCH_PATTERN= Aborted.*Got timeout reading communication packets; source include/search_pattern_in_file.inc; set global log_warnings=@@log_warnings; - - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/main/xa.result b/mysql-test/main/xa.result index a692e5ec311..a380e320f39 100644 --- a/mysql-test/main/xa.result +++ b/mysql-test/main/xa.result @@ -1,5 +1,5 @@ call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction"); -drop table if exists t1, t2; +call mtr.add_suppression("InnoDB: Transaction was aborted due to "); create table t1 (a int) engine=innodb; xa start 'test1'; insert t1 values (10); @@ -593,6 +593,4 @@ formatID gtrid_length bqual_length data xa rollback '4'; ERROR XA100: XA_RBROLLBACK: Transaction branch was rolled back set @@global.read_only=@sav_read_only; -# # End of 10.5 tests -# diff --git a/mysql-test/main/xa.test b/mysql-test/main/xa.test index a4c60ef316d..e3384f6784f 100644 --- a/mysql-test/main/xa.test +++ b/mysql-test/main/xa.test @@ -1,21 +1,12 @@ # # WL#1756 # --- source include/have_innodb.inc +--source include/have_innodb.inc --source include/not_embedded.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction"); ---disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); ---enable_query_log - ---disable_warnings -drop table if exists t1, t2; ---enable_warnings create table t1 (a int) engine=innodb; xa start 'test1'; insert t1 values (10); @@ -84,7 +75,6 @@ xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'; select * from t1; disconnect con1; ---source include/wait_until_count_sessions.inc xa rollback 'testb',0x2030405060,11; xa recover; @@ -584,8 +574,6 @@ XA ROLLBACK 'xid1'; --error ER_PARSE_ERROR XA START 'gtrid', 'bqual', 0x80000000; ---source include/wait_until_count_sessions.inc - --echo # --echo # XA states and SHOW commands --echo # @@ -696,7 +684,6 @@ xa rollback 'test1'; xa recover; drop table asd; disconnect con_tmp; ---source include/wait_until_disconnected.inc connection default; --echo # MDEV-30978: a read-only server should still allow the commit of @@ -719,8 +706,6 @@ xa prepare '2'; xa rollback '2'; --echo # Read-only disconnect case - ---source include/count_sessions.inc connect (con1_ro,localhost,root,,); xa start '3'; select 0; @@ -729,12 +714,10 @@ xa prepare '3'; disconnect con1_ro; connection default; ---source include/wait_until_count_sessions.inc xa recover; --error ER_XA_RBROLLBACK xa commit '3'; ---source include/count_sessions.inc connect (con2_ro,localhost,root,,); xa start '4'; select 0; @@ -743,14 +726,10 @@ xa prepare '4'; disconnect con2_ro; connection default; ---source include/wait_until_count_sessions.inc xa recover; --error ER_XA_RBROLLBACK xa rollback '4'; set @@global.read_only=@sav_read_only; - ---echo # --echo # End of 10.5 tests ---echo # diff --git a/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test b/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test index dd0cdd0f82e..2b1c2d78b30 100644 --- a/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test +++ b/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test @@ -22,7 +22,6 @@ DROP TABLE IF EXISTS t1 ; --enable_warnings ---enable_connect_log --echo # READ_ONLY does nothing to SUPER users --echo # so we use a non-SUPER one: CREATE USER test@localhost; @@ -89,4 +88,3 @@ SET GLOBAL READ_ONLY=0; disconnect con1; DROP USER test@localhost; ---disable_connect_log diff --git a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test b/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test index a34b77195e7..1def37c4f3d 100644 --- a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test +++ b/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test @@ -3,6 +3,7 @@ --source include/have_binlog_format_mixed.inc --source include/have_innodb.inc +--source include/count_sessions.inc RESET MASTER; # clear binlogs # MDEV-22420 DDL on temporary object is prohibited when XA is in prepare state @@ -126,7 +127,6 @@ DROP TABLE t1; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); ---source include/count_sessions.inc --connect(con1,localhost,root,,) XA START '1'; @@ -148,8 +148,6 @@ XA COMMIT '1'; --source include/show_binlog_events.inc DROP TABLE t1; ---source include/count_sessions.inc - --connect(con2,localhost,root,,) CREATE TABLE tm (a INT PRIMARY KEY) ENGINE=MyISAM; XA START '1'; diff --git a/mysql-test/suite/binlog/t/binlog_truncate_kill.test b/mysql-test/suite/binlog/t/binlog_truncate_kill.test index 0b9e873d17e..62bf9f057d4 100644 --- a/mysql-test/suite/binlog/t/binlog_truncate_kill.test +++ b/mysql-test/suite/binlog/t/binlog_truncate_kill.test @@ -46,7 +46,6 @@ connection con1; --source include/show_binlog_events.inc disconnect con1; ---source include/wait_until_disconnected.inc connection default; SELECT * FROM t1; diff --git a/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test b/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test index b089b7cc975..d5cf08c9b04 100644 --- a/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test +++ b/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test @@ -2,7 +2,6 @@ --source include/have_debug.inc --source include/have_debug_sync.inc --source include/have_binlog_format_mixed.inc ---source include/count_sessions.inc RESET MASTER; @@ -89,4 +88,3 @@ SELECT * FROM t; --disconnect pause_purge SET DEBUG_SYNC="RESET"; DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/binlog_encryption/rpl_ssl.result b/mysql-test/suite/binlog_encryption/rpl_ssl.result index 8c696f25752..a8f2d78ecdf 100644 --- a/mysql-test/suite/binlog_encryption/rpl_ssl.result +++ b/mysql-test/suite/binlog_encryption/rpl_ssl.result @@ -55,5 +55,5 @@ master_ssl = 1, master_ssl_ca = '', master_ssl_cert = '', master_ssl_key = ''; -End of 5.0 tests +# End of 5.0 tests include/rpl_end.inc diff --git a/mysql-test/suite/compat/oracle/t/sp-package-concurrent-dml.inc b/mysql-test/suite/compat/oracle/t/sp-package-concurrent-dml.inc index 8ee96d1ee6a..e876382755d 100644 --- a/mysql-test/suite/compat/oracle/t/sp-package-concurrent-dml.inc +++ b/mysql-test/suite/compat/oracle/t/sp-package-concurrent-dml.inc @@ -2,8 +2,6 @@ --echo # Start of sp-package-concurrent-dml.inc --echo # ---source include/count_sessions.inc - let $object_type= `SELECT @object_type`; SET sql_mode=ORACLE; @@ -103,5 +101,3 @@ connection default; reap; DROP PACKAGE IF EXISTS pkg1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/csv/csv.test b/mysql-test/suite/csv/csv.test index cea6c7591bc..60d967f3535 100644 --- a/mysql-test/suite/csv/csv.test +++ b/mysql-test/suite/csv/csv.test @@ -1808,7 +1808,6 @@ connect (con1,localhost,root,,); --error 29 select * from t1; --disconnect con1 ---source include/wait_until_disconnected.inc connection default; unlock tables; drop table t1; diff --git a/mysql-test/suite/encryption/t/create_or_replace.test b/mysql-test/suite/encryption/t/create_or_replace.test index 2ebd599d460..a6638e4a5c8 100644 --- a/mysql-test/suite/encryption/t/create_or_replace.test +++ b/mysql-test/suite/encryption/t/create_or_replace.test @@ -1,6 +1,5 @@ --source include/have_innodb.inc --source include/have_file_key_management_plugin.inc ---source include/count_sessions.inc SET @save_threads = @@GLOBAL.innodb_encryption_threads; @@ -75,4 +74,3 @@ drop table create_or_replace_t, table1_int_autoinc, table0_int_autoinc, table10_int_autoinc; SET GLOBAL innodb_encryption_threads = @save_threads; ---source include/wait_until_count_sessions.inc 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 2771c674f44..260681c716a 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_USER.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_USER.result @@ -39,6 +39,5 @@ REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; REVOKE ALL ON mysqltest1.* FROM ''@'localhost%'; DROP USER tester@'%'; DROP USER ''@'localhost%'; -FLUSH PRIVILEGES; connection slave; include/rpl_end.inc diff --git a/mysql-test/suite/events/events_grant.result b/mysql-test/suite/events/events_grant.result index 4f35cd385bb..d23373da2d3 100644 --- a/mysql-test/suite/events/events_grant.result +++ b/mysql-test/suite/events/events_grant.result @@ -141,7 +141,6 @@ EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER EVENT_BODY EVENT_DEFINITION EVENT_ def events_test three_event ev_test@localhost SQL SELECT 123 RECURRING NULL 20 SECOND ENABLED PRESERVE three event def events_test two_event ev_test@localhost SQL SELECT 123 RECURRING NULL 20 SECOND ENABLED NOT PRESERVE two event def events_test2 five_event root@localhost SQL SELECT 42 RECURRING NULL 20 SECOND ENABLED NOT PRESERVE -connection ev_con1; disconnect ev_con1; connection default; DROP USER ev_test@localhost; diff --git a/mysql-test/suite/events/events_grant.test b/mysql-test/suite/events/events_grant.test index 2fe39a6cf2d..dfb3a7dc9c6 100644 --- a/mysql-test/suite/events/events_grant.test +++ b/mysql-test/suite/events/events_grant.test @@ -100,9 +100,7 @@ DROP EVENT one_event; connection default; --echo "One event should not be there" SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_DEFINITION, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS ORDER BY EVENT_SCHEMA, EVENT_NAME; -connection ev_con1; disconnect ev_con1; ---source include/wait_until_disconnected.inc connection default; DROP USER ev_test@localhost; DROP DATABASE events_test2; diff --git a/mysql-test/suite/events/events_trans_notembedded.test b/mysql-test/suite/events/events_trans_notembedded.test index 3cf823bf713..57bcc9639b7 100644 --- a/mysql-test/suite/events/events_trans_notembedded.test +++ b/mysql-test/suite/events/events_trans_notembedded.test @@ -51,7 +51,6 @@ delete from t1; commit work; # Cleanup disconnect conn1; ---source include/wait_until_disconnected.inc connection default; drop user mysqltest_user1@localhost; drop database mysqltest_db2; 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 4c3eeb24679..82a8007e68d 100644 --- a/mysql-test/suite/funcs_1/r/is_check_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_check_constraints.result @@ -9,7 +9,7 @@ GRANT USAGE ON *.* TO `boo1`@`%` GRANT SELECT, CREATE, DROP, ALTER ON `foo`.* TO `boo1`@`%` CREATE user boo2; create database foo; -CONNECT con1,localhost, boo1,, foo; +connect con1,localhost, boo1,, foo; SET check_constraint_checks=1; CREATE TABLE t0 ( @@ -108,11 +108,11 @@ def foo t3 b Column `b` > 0 def foo t3 b Table `b` > 10 def foo t3 b1 Table `b` < 123456789012345678901234567890123456789012345678901234567890123456789 disconnect con1; -CONNECT con2, localhost, boo2,,"*NO-ONE*"; +connect con2, localhost, boo2,,"*NO-ONE*"; SELECT * from information_schema.check_constraints; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA TABLE_NAME CONSTRAINT_NAME LEVEL CHECK_CLAUSE disconnect con2; -CONNECT con1, localhost, boo1,,foo; +connect con1, localhost, boo1,,foo; DROP TABLE t0; DROP TABLE t1; DROP TABLE t2; @@ -140,7 +140,7 @@ CONSTRAINT_CATALOG CONSTRAINT_SCHEMA TABLE_NAME CONSTRAINT_NAME LEVEL CHECK_CLAU def db t1 CONSTRAINT_1 Table `b` > 0 def mysql global_priv Priv Column json_valid(`Priv`) def mysql servers Options Column json_valid(`Options`) -CONNECT con1,localhost, foo,, db; +connect con1,localhost, foo,, db; SELECT a FROM t1; a 1 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 e30bd86833f..bb7441d79a0 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 @@ -1,7 +1,6 @@ ############################################################################## # Testcases 3.2.9.2+3.2.9.3 INFORMATION_SCHEMA.SCHEMATA accessible information ############################################################################## -DROP DATABASE IF EXISTS db_datadict; CREATE DATABASE db_datadict; DROP USER 'testuser1'@'localhost'; CREATE USER 'testuser1'@'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 3ae45e23cb8..1e54e083fb3 100644 --- a/mysql-test/suite/funcs_1/t/is_check_constraints.test +++ b/mysql-test/suite/funcs_1/t/is_check_constraints.test @@ -10,7 +10,7 @@ SHOW GRANTS for boo1; CREATE user boo2; create database foo; # Connect with user boo1 -CONNECT(con1,localhost, boo1,, foo); +connect(con1,localhost, boo1,, foo); SET check_constraint_checks=1; CREATE TABLE t0 @@ -76,21 +76,21 @@ CONSTRAINT b1 check (b<123456789012345678901234567890123456789012345678901234567 --sorted_result SELECT * from information_schema.check_constraints; -DISCONNECT con1; -CONNECT(con2, localhost, boo2,,"*NO-ONE*"); +disconnect con1; +connect(con2, localhost, boo2,,"*NO-ONE*"); --sorted_result SELECT * from information_schema.check_constraints; -DISCONNECT con2; -CONNECT(con1, localhost, boo1,,foo); +disconnect con2; +connect(con1, localhost, boo1,,foo); DROP TABLE t0; DROP TABLE t1; DROP TABLE t2; DROP TABLE t3; DROP DATABASE foo; -DISCONNECT con1; ---CONNECTION default +disconnect con1; +--connection default DROP USER boo1; DROP USER boo2; @@ -109,12 +109,12 @@ SHOW GRANTS FOR foo; --sorted_result SELECT * FROM information_schema.check_constraints; -CONNECT(con1,localhost, foo,, db); +connect(con1,localhost, foo,, db); SELECT a FROM t1; --sorted_result SELECT * FROM information_schema.check_constraints; ---CONNECTION default +--connection default DROP USER foo; DROP DATABASE db; 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 200ee66e2a1..bcbbff7276e 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 @@ -21,9 +21,6 @@ # 3.2.9.3 Ensure that the table does not show any information on any databases # on which the current user and PUBLIC have no privileges. # ---disable_warnings -DROP DATABASE IF EXISTS db_datadict; ---enable_warnings CREATE DATABASE db_datadict; # Create a low privileged user. @@ -56,4 +53,3 @@ eval $my_show3; connection default; DROP USER 'testuser1'@'localhost'; DROP DATABASE db_datadict; - diff --git a/mysql-test/suite/gcol/r/gcol_rollback.result b/mysql-test/suite/gcol/r/gcol_rollback.result index 0bbf034122b..6aafef21da5 100644 --- a/mysql-test/suite/gcol/r/gcol_rollback.result +++ b/mysql-test/suite/gcol/r/gcol_rollback.result @@ -1,3 +1,4 @@ +FLUSH TABLES; CREATE TABLE t ( a INTEGER, b BLOB GENERATED ALWAYS AS (a) VIRTUAL, diff --git a/mysql-test/suite/gcol/t/gcol_bug20746926.test b/mysql-test/suite/gcol/t/gcol_bug20746926.test index 8028823f9a7..133203b2055 100644 --- a/mysql-test/suite/gcol/t/gcol_bug20746926.test +++ b/mysql-test/suite/gcol/t/gcol_bug20746926.test @@ -13,8 +13,6 @@ c timestamp generated always as ((a not in (b,b))) stored insert t1(a) values(7777777777); show warnings; disconnect con1; ---source include/wait_until_disconnected.inc - connect(con2,localhost,root,,); --disable_warnings set sql_mode=''; @@ -24,5 +22,4 @@ show warnings; drop table t1; disconnect con2; ---source include/wait_until_disconnected.inc connection default; diff --git a/mysql-test/suite/gcol/t/gcol_rollback.test b/mysql-test/suite/gcol/t/gcol_rollback.test index 888e6be861e..5ee87ddc70b 100644 --- a/mysql-test/suite/gcol/t/gcol_rollback.test +++ b/mysql-test/suite/gcol/t/gcol_rollback.test @@ -3,13 +3,7 @@ --source include/have_debug_sync.inc --source include/not_embedded.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - -# Make sure there are no unexpected open tables from previous tests ---disable_query_log FLUSH TABLES; ---enable_query_log CREATE TABLE t ( a INTEGER, @@ -130,7 +124,4 @@ ROLLBACK; disconnect con1; DROP TABLE t1; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - --echo # End of 10.4 tests diff --git a/mysql-test/suite/gcol/t/innodb_virtual_debug.test b/mysql-test/suite/gcol/t/innodb_virtual_debug.test index 337af3e5d95..6d28383ae9e 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_debug.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_debug.test @@ -1,7 +1,6 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc --source include/have_debug.inc ---source include/count_sessions.inc set default_storage_engine=innodb; # Ensure that the history list length will actually be decremented by purge. @@ -343,5 +342,3 @@ connection default; SET DEBUG_SYNC=RESET; SET GLOBAL innodb_stats_persistent = @save_stats_persistent; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test index d41cc0c02b1..3d55014c4ec 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test @@ -77,8 +77,6 @@ DROP TABLE t1; # # BUG#22082762 RE-ENABLE SUPPORT FOR ADDING VIRTUAL INDEX WHILE DROPPING VIRTUAL COLUMN # ---source include/count_sessions.inc - connect (con1,localhost,root,,); connection default; @@ -258,15 +256,6 @@ disconnect truncate; connection default; DROP TABLE t1, t2; ---disable_cursor_protocol ---disable_ps2_protocol ---enable_ps2_protocol ---enable_cursor_protocol ---disable_cursor_protocol ---disable_ps2_protocol ---enable_ps2_protocol ---enable_cursor_protocol ---source include/wait_until_count_sessions.inc set debug_sync=reset; SET GLOBAL innodb_stats_persistent = @saved_stats_persistent; diff --git a/mysql-test/suite/gcol/t/innodb_virtual_purge.test b/mysql-test/suite/gcol/t/innodb_virtual_purge.test index 5f3cae34057..d1c0e2dad40 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_purge.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_purge.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent; SET GLOBAL innodb_stats_persistent = 0; @@ -186,5 +185,3 @@ CHECK TABLE t EXTENDED; DROP TABLE t; SET GLOBAL innodb_stats_persistent = @save_stats_persistent; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result index 5bba232d7b8..0ae799651ea 100644 --- a/mysql-test/suite/handler/aria.result +++ b/mysql-test/suite/handler/aria.result @@ -1217,11 +1217,8 @@ connection default; # Reaping 'handler t1 read a next'... ERROR 42S02: Table 'test.t1' doesn't exist handler t1 close; -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; # @@ -1377,7 +1374,6 @@ a b handler t1 close; # Cleanup. drop table t1; -connection con1; disconnect con1; connection default; # @@ -1527,7 +1523,6 @@ ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 READ id NEXT; ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 CLOSE; -connection con51355; disconnect con51355; connection default; # diff --git a/mysql-test/suite/handler/handler.inc b/mysql-test/suite/handler/handler.inc index 25dbf0c6595..f084b03381b 100644 --- a/mysql-test/suite/handler/handler.inc +++ b/mysql-test/suite/handler/handler.inc @@ -993,15 +993,9 @@ connection default; --reap handler t1 close; -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc -connection con3; disconnect con3; ---source include/wait_until_disconnected.inc connection default; --echo # @@ -1110,9 +1104,7 @@ handler t1 read a prev; handler t1 close; --echo # Cleanup. drop table t1; -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc connection default; --echo # @@ -1280,12 +1272,9 @@ HANDLER t1 READ id NEXT; HANDLER t1 READ id NEXT; HANDLER t1 CLOSE; -connection con51355; disconnect con51355; ---source include/wait_until_disconnected.inc connection default; - --echo # --echo # Bug#54401 assert in Diagnostics_area::set_eof_status , HANDLER --echo # diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result index c631d48de2d..9ed3914fbec 100644 --- a/mysql-test/suite/handler/heap.result +++ b/mysql-test/suite/handler/heap.result @@ -1216,11 +1216,8 @@ connection default; # Reaping 'handler t1 read a next'... ERROR 42S02: Table 'test.t1' doesn't exist handler t1 close; -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; # @@ -1376,7 +1373,6 @@ a b handler t1 close; # Cleanup. drop table t1; -connection con1; disconnect con1; connection default; # @@ -1526,7 +1522,6 @@ ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 READ id NEXT; ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 CLOSE; -connection con51355; disconnect con51355; connection default; # diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index a89f4e0b287..87c1523e174 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -1221,11 +1221,8 @@ connection default; # Reaping 'handler t1 read a next'... ERROR 42S02: Table 'test.t1' doesn't exist handler t1 close; -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; # @@ -1381,7 +1378,6 @@ a b handler t1 close; # Cleanup. drop table t1; -connection con1; disconnect con1; connection default; # @@ -1531,7 +1527,6 @@ ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 READ id NEXT; ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 CLOSE; -connection con51355; disconnect con51355; connection default; # @@ -1753,11 +1748,8 @@ commit; # # Cleanup for savepoint.inc # -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; CREATE TABLE t1 (f1 integer, f2 integer, primary key (f1), key (f2)) engine=innodb; diff --git a/mysql-test/suite/handler/interface.result b/mysql-test/suite/handler/interface.result index 2a0f36e5fa2..1ad2f49a471 100644 --- a/mysql-test/suite/handler/interface.result +++ b/mysql-test/suite/handler/interface.result @@ -223,9 +223,7 @@ handler t1 close; ERROR 42S02: Unknown table 't1' in HANDLER connection default; drop table t0; -connection flush; disconnect flush; -connection waiter; disconnect waiter; connection default; create table t1 (a int); @@ -295,7 +293,6 @@ handler t1 close; connection con1; drop table t1; disconnect con1; -connection con2; disconnect con2; connection default; USE information_schema; diff --git a/mysql-test/suite/handler/interface.test b/mysql-test/suite/handler/interface.test index 43abe47cf9b..094f2e07ab5 100644 --- a/mysql-test/suite/handler/interface.test +++ b/mysql-test/suite/handler/interface.test @@ -243,12 +243,8 @@ handler t1 read next; handler t1 close; connection default; drop table t0; -connection flush; disconnect flush; ---source include/wait_until_disconnected.inc -connection waiter; disconnect waiter; ---source include/wait_until_disconnected.inc connection default; # @@ -325,10 +321,7 @@ connection con1; --reap # Since last in this connection was a send drop table t1; disconnect con1; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc connection default; # diff --git a/mysql-test/suite/handler/myisam.result b/mysql-test/suite/handler/myisam.result index 70fbe03245c..c93be29a035 100644 --- a/mysql-test/suite/handler/myisam.result +++ b/mysql-test/suite/handler/myisam.result @@ -1217,11 +1217,8 @@ connection default; # Reaping 'handler t1 read a next'... ERROR 42S02: Table 'test.t1' doesn't exist handler t1 close; -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; # @@ -1377,7 +1374,6 @@ a b handler t1 close; # Cleanup. drop table t1; -connection con1; disconnect con1; connection default; # @@ -1527,7 +1523,6 @@ ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 READ id NEXT; ERROR 42S02: Table 'test.t1' doesn't exist HANDLER t1 CLOSE; -connection con51355; disconnect con51355; connection default; # diff --git a/mysql-test/suite/handler/savepoint.inc b/mysql-test/suite/handler/savepoint.inc index a237183ef11..b0b7f7952d2 100644 --- a/mysql-test/suite/handler/savepoint.inc +++ b/mysql-test/suite/handler/savepoint.inc @@ -170,13 +170,7 @@ commit; --echo # --echo # Cleanup for savepoint.inc --echo # -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc -connection con3; disconnect con3; ---source include/wait_until_disconnected.inc connection default; diff --git a/mysql-test/suite/innodb/r/innodb_bug30113362.result b/mysql-test/suite/innodb/r/innodb_bug30113362.result index 5d30c5c03dd..a64721ec73d 100644 --- a/mysql-test/suite/innodb/r/innodb_bug30113362.result +++ b/mysql-test/suite/innodb/r/innodb_bug30113362.result @@ -1,3 +1,6 @@ +SET @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug; +SET @old_innodb_adaptive_hash_index = @@innodb_adaptive_hash_index; +SET @old_innodb_stats_persistent = @@innodb_stats_persistent; SET GLOBAL innodb_adaptive_hash_index = false; SET GLOBAL innodb_stats_persistent = false; connect purge_control,localhost,root,,; @@ -120,3 +123,6 @@ CLUST_INDEX_SIZE 1792 SET DEBUG_SYNC = 'RESET'; DROP TABLE t1; +SET GLOBAL innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug; +SET GLOBAL innodb_adaptive_hash_index = @old_innodb_adaptive_hash_index; +SET GLOBAL innodb_stats_persistent = @old_innodb_stats_persistent; diff --git a/mysql-test/suite/innodb/r/innodb_notembedded.result b/mysql-test/suite/innodb/r/innodb_notembedded.result index b8ff28a10b5..f206d1f247c 100644 --- a/mysql-test/suite/innodb/r/innodb_notembedded.result +++ b/mysql-test/suite/innodb/r/innodb_notembedded.result @@ -24,9 +24,7 @@ connection a; rollback; connection b; rollback; -connection a; disconnect a; -connection b; disconnect b; connection default; drop table t1; diff --git a/mysql-test/suite/innodb/t/auto_increment_lock_mode.test b/mysql-test/suite/innodb/t/auto_increment_lock_mode.test index 27497960e72..5a220d39459 100644 --- a/mysql-test/suite/innodb/t/auto_increment_lock_mode.test +++ b/mysql-test/suite/innodb/t/auto_increment_lock_mode.test @@ -23,7 +23,6 @@ INSERT INTO t6(b) SELECT p1(); UPDATE t1,t2,t3,t4,t5 SET t1.a=2,t2.a=2,t3.a=2,t4.a=2,t5.a=2; SELECT * FROM t1; ---source include/count_sessions.inc --connect(con1,localhost,root,,) let $ID1= `SELECT @id := CONNECTION_ID()`; @@ -58,4 +57,3 @@ evalp KILL QUERY $ID3; DROP FUNCTION p1; DROP TABLE t1,t2,t3,t4,t5,t6; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/avoid_deadlock_with_blocked.test b/mysql-test/suite/innodb/t/avoid_deadlock_with_blocked.test index 6284fa41f8f..ce0ffda3c8d 100644 --- a/mysql-test/suite/innodb/t/avoid_deadlock_with_blocked.test +++ b/mysql-test/suite/innodb/t/avoid_deadlock_with_blocked.test @@ -1,7 +1,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); @@ -224,5 +223,3 @@ INSERT INTO t1 (id) VALUES (1); --disconnect stop_purge DROP TABLE t1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/blob_cmp_empty.test b/mysql-test/suite/innodb/t/blob_cmp_empty.test index f41ac79b16f..58b115577af 100644 --- a/mysql-test/suite/innodb/t/blob_cmp_empty.test +++ b/mysql-test/suite/innodb/t/blob_cmp_empty.test @@ -1,5 +1,4 @@ --source include/innodb_row_format.inc ---source include/count_sessions.inc --connect(prevent_purge,localhost,root,,) start transaction with consistent snapshot; @@ -23,4 +22,3 @@ CHECK TABLE t1; --disconnect con1 --disconnect prevent_purge DROP TABLE t1; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/change_column_collation.test b/mysql-test/suite/innodb/t/change_column_collation.test index edc298fe3e9..fc5042a9904 100644 --- a/mysql-test/suite/innodb/t/change_column_collation.test +++ b/mysql-test/suite/innodb/t/change_column_collation.test @@ -2,8 +2,6 @@ --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc - --echo # --echo # MDEV-26294 Duplicate entries in unique index not detected when --echo # changing collation with INPLACE algorithm @@ -153,4 +151,3 @@ SET SYSTEM_VERSIONING_ALTER_HISTORY= KEEP; ALTER TABLE t ADD COLUMN v VARCHAR(128) GENERATED ALWAYS AS (CRC32('MariaDB')); ALTER TABLE t ADD INDEX (v); DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/create_select.test b/mysql-test/suite/innodb/t/create_select.test index 46f793295bf..7296990abd4 100644 --- a/mysql-test/suite/innodb/t/create_select.test +++ b/mysql-test/suite/innodb/t/create_select.test @@ -1,6 +1,5 @@ --source include/have_innodb.inc --source include/have_sequence.inc ---source include/count_sessions.inc --source include/maybe_debug.inc let $ID= `SELECT @id := CONNECTION_ID()`; @@ -70,6 +69,4 @@ disconnect con1; connection default; DROP TABLE t3,t2,t1; ---source include/wait_until_count_sessions.inc - --echo # End of 10.6 tests diff --git a/mysql-test/suite/innodb/t/cursor-restore-locking.test b/mysql-test/suite/innodb/t/cursor-restore-locking.test index 0b817da307f..a2a8a5d1525 100644 --- a/mysql-test/suite/innodb/t/cursor-restore-locking.test +++ b/mysql-test/suite/innodb/t/cursor-restore-locking.test @@ -1,5 +1,4 @@ ---source include/have_innodb.inc ---source include/count_sessions.inc +source include/have_innodb.inc; source include/have_debug.inc; source include/have_debug_sync.inc; @@ -84,4 +83,3 @@ INSERT INTO t VALUES(30, 20); # trx_4 SET DEBUG_SYNC = 'RESET'; DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/cursor-restore-unique-null.test b/mysql-test/suite/innodb/t/cursor-restore-unique-null.test index 409694d695b..b06c879a5e8 100644 --- a/mysql-test/suite/innodb/t/cursor-restore-unique-null.test +++ b/mysql-test/suite/innodb/t/cursor-restore-unique-null.test @@ -1,8 +1,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc - CREATE TABLE t(a INT PRIMARY KEY, b INT, c INT, UNIQUE KEY `b_c` (`b`,`c`)) ENGINE=InnoDB, STATS_PERSISTENT=0; @@ -33,4 +31,3 @@ SET DEBUG_SYNC="RESET"; --disconnect con1 DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/deadlock_detect.test b/mysql-test/suite/innodb/t/deadlock_detect.test index 39ea174a3ec..2aee083e4b2 100644 --- a/mysql-test/suite/innodb/t/deadlock_detect.test +++ b/mysql-test/suite/innodb/t/deadlock_detect.test @@ -3,7 +3,6 @@ # --source include/have_innodb.inc ---source include/count_sessions.inc --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); @@ -97,4 +96,3 @@ ROLLBACK; --enable_result_log DROP TABLE t1; DROP TABLE dl; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test b/mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test index ea8b5837d93..7a45b7204e0 100644 --- a/mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test +++ b/mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); @@ -82,4 +81,3 @@ COMMIT; --connection default DROP TABLE t1,t2,t3; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/deadlock_on_lock_upgrade.test b/mysql-test/suite/innodb/t/deadlock_on_lock_upgrade.test index 9ab27ef6cc1..72844e225b6 100644 --- a/mysql-test/suite/innodb/t/deadlock_on_lock_upgrade.test +++ b/mysql-test/suite/innodb/t/deadlock_on_lock_upgrade.test @@ -5,7 +5,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --connection default # There are various scenarious in which a transaction already holds "half" @@ -139,5 +138,3 @@ INSERT INTO t (`id`) VALUES (1), (2); DROP TABLE `t`; SET DEBUG_SYNC='reset'; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/deadlock_victim_race.test b/mysql-test/suite/innodb/t/deadlock_victim_race.test index 599b1e75838..df24379ef21 100644 --- a/mysql-test/suite/innodb/t/deadlock_victim_race.test +++ b/mysql-test/suite/innodb/t/deadlock_victim_race.test @@ -1,6 +1,5 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); @@ -115,4 +114,3 @@ SET DEBUG_SYNC = 'RESET'; DROP TABLE t; DROP TABLE t2; --disconnect cancel_purge ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test b/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test index 9ea87a56f7e..fa0bab6cb44 100644 --- a/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test +++ b/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test @@ -1,6 +1,5 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); @@ -69,4 +68,3 @@ SET DEBUG_SYNC="lock_wait_before_suspend SIGNAL upd_cont"; SET DEBUG_SYNC = 'RESET'; DROP TABLE t; DROP TABLE t2; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/deadlock_wait_thr_race.test b/mysql-test/suite/innodb/t/deadlock_wait_thr_race.test index ee19e087627..0c1a54f257f 100644 --- a/mysql-test/suite/innodb/t/deadlock_wait_thr_race.test +++ b/mysql-test/suite/innodb/t/deadlock_wait_thr_race.test @@ -1,6 +1,5 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); @@ -73,4 +72,3 @@ SET DEBUG_SYNC="now SIGNAL upd_cont_2"; SET DEBUG_SYNC = 'RESET'; DROP TABLE t; DROP TABLE t2; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/foreign_key.test b/mysql-test/suite/innodb/t/foreign_key.test index 497585d74f4..6ce39363690 100644 --- a/mysql-test/suite/innodb/t/foreign_key.test +++ b/mysql-test/suite/innodb/t/foreign_key.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/default_charset.inc --disable_query_log diff --git a/mysql-test/suite/innodb/t/implicit_gap_lock_convertion.test b/mysql-test/suite/innodb/t/implicit_gap_lock_convertion.test index bf2d09ffb2e..45cd42e0933 100644 --- a/mysql-test/suite/innodb/t/implicit_gap_lock_convertion.test +++ b/mysql-test/suite/innodb/t/implicit_gap_lock_convertion.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc CREATE TABLE t(a INT UNSIGNED PRIMARY KEY) ENGINE=InnoDB; @@ -18,4 +17,3 @@ INSERT INTO t VALUES (15); --disconnect con1 DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb-alter-debug.test b/mysql-test/suite/innodb/t/innodb-alter-debug.test index 6b94bfd214f..c982f64bd79 100644 --- a/mysql-test/suite/innodb/t/innodb-alter-debug.test +++ b/mysql-test/suite/innodb/t/innodb-alter-debug.test @@ -2,8 +2,6 @@ --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc - SET NAMES utf8; CREATE TABLE â‘  ( @@ -201,6 +199,3 @@ SET debug_dbug=@save_dbug; DROP TABLE t1; --echo # End of 10.6 tests - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb-alter-nullable.test b/mysql-test/suite/innodb/t/innodb-alter-nullable.test index af13a12ab41..76da8120c6b 100644 --- a/mysql-test/suite/innodb/t/innodb-alter-nullable.test +++ b/mysql-test/suite/innodb/t/innodb-alter-nullable.test @@ -1,8 +1,5 @@ --source include/innodb_page_size.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - CREATE TABLE t (c1 INT PRIMARY KEY, c2 INT NOT NULL, c3 INT) ENGINE=InnoDB; INSERT INTO t VALUES (1,2,3),(4,5,6),(7,8,9); @@ -155,7 +152,3 @@ SELECT * FROM t1; SELECT * FROM t2; SELECT * FROM t3; DROP TABLE t1,t2,t3; - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb-index-debug.test b/mysql-test/suite/innodb/t/innodb-index-debug.test index cfe893f5b9d..a1139c7cb77 100644 --- a/mysql-test/suite/innodb/t/innodb-index-debug.test +++ b/mysql-test/suite/innodb/t/innodb-index-debug.test @@ -1,6 +1,5 @@ -- source include/have_debug.inc -- source include/have_innodb.inc --- source include/count_sessions.inc -- source include/have_debug_sync.inc # This test is slow on buildbot. --source include/big_test.inc @@ -165,7 +164,6 @@ SET DEBUG_SYNC='RESET'; DROP TABLE t1; SET DEBUG_SYNC='RESET'; ---source include/wait_until_count_sessions.inc --echo # --echo # BUG#21612714 ALTER TABLE SORTING SKIPPED WHEN CHANGE PK AND DROP diff --git a/mysql-test/suite/innodb/t/innodb-index-online-delete.test b/mysql-test/suite/innodb/t/innodb-index-online-delete.test index ec5f93731ed..834ff617ccf 100644 --- a/mysql-test/suite/innodb/t/innodb-index-online-delete.test +++ b/mysql-test/suite/innodb/t/innodb-index-online-delete.test @@ -1,9 +1,6 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - connect (con1,localhost,root,,); connection default; @@ -30,7 +27,3 @@ connection default; reap; SET DEBUG_SYNC='RESET'; DROP TABLE t; - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb-index-online-purge.test b/mysql-test/suite/innodb/t/innodb-index-online-purge.test index 28ff9403c0c..2d9c3fd1735 100644 --- a/mysql-test/suite/innodb/t/innodb-index-online-purge.test +++ b/mysql-test/suite/innodb/t/innodb-index-online-purge.test @@ -1,9 +1,6 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - connect (con1,localhost,root,,); connect (con2,localhost,root,,); @@ -67,7 +64,3 @@ disconnect con1; connection default; SET DEBUG_SYNC='RESET'; DROP TABLE t,u; - -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb-index-online.test b/mysql-test/suite/innodb/t/innodb-index-online.test index 2581d7dc42e..675b6a62926 100644 --- a/mysql-test/suite/innodb/t/innodb-index-online.test +++ b/mysql-test/suite/innodb/t/innodb-index-online.test @@ -13,9 +13,6 @@ SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl call mtr.add_suppression("InnoDB: Warning: Small buffer pool size"); -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, c3 TEXT) ENGINE=InnoDB STATS_PERSISTENT=0; INSERT INTO t1 VALUES (1,1,''), (2,2,''), (3,3,''), (4,4,''), (5,5,''); @@ -537,10 +534,6 @@ DROP TABLE t1; SET DEBUG_SYNC = 'RESET'; -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc - --disable_warnings SET GLOBAL innodb_monitor_enable = default; SET GLOBAL innodb_monitor_disable = default; diff --git a/mysql-test/suite/innodb/t/innodb-read-view.test b/mysql-test/suite/innodb/t/innodb-read-view.test index 21c79cf6566..4c2f8ffc8fb 100644 --- a/mysql-test/suite/innodb/t/innodb-read-view.test +++ b/mysql-test/suite/innodb/t/innodb-read-view.test @@ -11,7 +11,6 @@ # g. T3 Does a select - it should not see the changes of T1 & T2 --source include/have_innodb.inc ---source include/count_sessions.inc CREATE TABLE t1 (c1 INT , c2 CHAR(10), PRIMARY KEY (c1)) ENGINE = InnoDB; INSERT INTO t1 VALUES(0, "0"); @@ -164,5 +163,3 @@ disconnect con1; connection default; SET DEBUG_SYNC= 'RESET'; DROP TABLE t1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test index be7cfa466ad..106918fe6ea 100644 --- a/mysql-test/suite/innodb/t/innodb-table-online.test +++ b/mysql-test/suite/innodb/t/innodb-table-online.test @@ -17,9 +17,6 @@ call mtr.add_suppression("InnoDB: Warning: Small buffer pool size"); call mtr.add_suppression("InnoDB: Error: table 'test/t1'"); call mtr.add_suppression("MariaDB is trying to open a table handle but the .ibd file for"); -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL, c3 CHAR(255) NOT NULL) ENGINE = InnoDB; INSERT INTO t1 VALUES (1,1,''), (2,2,''), (3,3,''), (4,4,''), (5,5,''); @@ -472,10 +469,6 @@ DROP TABLE t1; SET DEBUG_SYNC=RESET; disconnect con1; -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc - --disable_warnings SET GLOBAL innodb_monitor_enable = default; SET GLOBAL innodb_monitor_disable = default; diff --git a/mysql-test/suite/innodb/t/innodb-timeout.test b/mysql-test/suite/innodb/t/innodb-timeout.test index 0f8bbbec559..f40bbfb58c5 100644 --- a/mysql-test/suite/innodb/t/innodb-timeout.test +++ b/mysql-test/suite/innodb/t/innodb-timeout.test @@ -1,5 +1,4 @@ # Save the initial number of concurrent sessions. ---source include/count_sessions.inc --source include/have_innodb.inc let $initial_timeout=`select @@innodb_lock_wait_timeout`; @@ -27,8 +26,6 @@ connection c; select @@innodb_lock_wait_timeout; disconnect c; ---source include/wait_until_disconnected.inc - connection a; --replace_result $connection_b_id eval SET @connection_b_id = $connection_b_id; @@ -107,12 +104,8 @@ connection b; reap; disconnect b; ---source include/wait_until_disconnected.inc - connection a; disconnect a; ---source include/wait_until_disconnected.inc - connection default; drop table t1; --replace_result $initial_timeout @@ -196,5 +189,3 @@ disconnect con2; # clear connection default; DROP TABLE t1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb_bug14676111.test b/mysql-test/suite/innodb/t/innodb_bug14676111.test index 3abc574a8d2..b3a19b653f2 100644 --- a/mysql-test/suite/innodb/t/innodb_bug14676111.test +++ b/mysql-test/suite/innodb/t/innodb_bug14676111.test @@ -2,7 +2,6 @@ -- source include/have_innodb.inc -- source include/have_debug.inc --- source include/count_sessions.inc set @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug; @@ -127,4 +126,3 @@ select CLUST_INDEX_SIZE from information_schema.INNODB_SYS_TABLESTATS where NAME drop table t1; set global innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug; --- source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb_bug30113362.test b/mysql-test/suite/innodb/t/innodb_bug30113362.test index 789f1a493cb..177ce00bf62 100644 --- a/mysql-test/suite/innodb/t/innodb_bug30113362.test +++ b/mysql-test/suite/innodb/t/innodb_bug30113362.test @@ -9,14 +9,9 @@ # debug sync points times out when using valgrind --source include/not_valgrind.inc ---disable_query_log SET @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert_debug; SET @old_innodb_adaptive_hash_index = @@innodb_adaptive_hash_index; SET @old_innodb_stats_persistent = @@innodb_stats_persistent; ---enable_query_log - -# Save the initial number of concurrent sessions ---source include/count_sessions.inc SET GLOBAL innodb_adaptive_hash_index = false; SET GLOBAL innodb_stats_persistent = false; @@ -235,10 +230,6 @@ SET DEBUG_SYNC = 'RESET'; DROP TABLE t1; ---disable_query_log SET GLOBAL innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug; SET GLOBAL innodb_adaptive_hash_index = @old_innodb_adaptive_hash_index; SET GLOBAL innodb_stats_persistent = @old_innodb_stats_persistent; ---enable_query_log - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb_bug42419.test b/mysql-test/suite/innodb/t/innodb_bug42419.test index 767a8118384..cb1af3b269c 100644 --- a/mysql-test/suite/innodb/t/innodb_bug42419.test +++ b/mysql-test/suite/innodb/t/innodb_bug42419.test @@ -19,9 +19,6 @@ if ($innodb_lock_wait_timeout < 10) exit; } -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - # First session connection default; @@ -78,7 +75,4 @@ connection default; disconnect user2; DROP TABLE t1; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction"); diff --git a/mysql-test/suite/innodb/t/innodb_i_s_innodb_locks.test b/mysql-test/suite/innodb/t/innodb_i_s_innodb_locks.test index e6e46dbf556..53410cb91eb 100644 --- a/mysql-test/suite/innodb/t/innodb_i_s_innodb_locks.test +++ b/mysql-test/suite/innodb/t/innodb_i_s_innodb_locks.test @@ -58,8 +58,6 @@ INSERT INTO ```t'\"_str` VALUES INSERT INTO ```t'\"_str` VALUES ('4', 'abc', 0x00616263, 0x61626300, 0x61006263, 0x6100626300, 0x610062630000); --- source include/count_sessions.inc - -- connect (con_lock,localhost,root,,) -- connect (con_min_trylock,localhost,root,,) -- connect (con_max_trylock,localhost,root,,) @@ -164,6 +162,4 @@ COMMIT; DROP TABLE t_min, t_max, ```t'\"_str`; --- source include/wait_until_count_sessions.inc - SET GLOBAL innodb_lock_wait_timeout=@save_timeout; diff --git a/mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test b/mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test index 745e1d94a12..c1812878c71 100644 --- a/mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test +++ b/mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test @@ -29,8 +29,6 @@ CREATE TABLE t2 ( INSERT INTO t2 VALUES (1,1),(2,2),(3,3); --- source include/count_sessions.inc - -- connect (con_trx,localhost,root,,) -- connect (con_verify_innodb_trx,localhost,root,,) @@ -90,6 +88,4 @@ FROM INFORMATION_SCHEMA.INNODB_TRX; DROP TABLE t2; DROP TABLE t1; --- source include/wait_until_count_sessions.inc - SET GLOBAL innodb_lock_wait_timeout=@save_timeout; diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test index 1fbf9f7eb57..9b019c73929 100644 --- a/mysql-test/suite/innodb/t/innodb_information_schema.test +++ b/mysql-test/suite/innodb/t/innodb_information_schema.test @@ -64,8 +64,6 @@ INSERT INTO ```t'\"_str` VALUES INSERT INTO ```t'\"_str` VALUES ('4', 'abc', 0x00616263, 0x61626300, 0x61006263, 0x6100626300, 0x610062630000); ---source include/count_sessions.inc - -- connect (con_lock,localhost,root,,) -- connect (con_min_trylock,localhost,root,,) -- connect (con_max_trylock,localhost,root,,) @@ -168,8 +166,6 @@ SET @@sql_mode=@save_sql_mode; DROP TABLE t_min, t_max, ```t'\"_str`; ---source include/wait_until_count_sessions.inc - # # Test that transaction data is correctly "visualized" in # INFORMATION_SCHEMA.INNODB_TRX diff --git a/mysql-test/suite/innodb/t/innodb_mysql.test b/mysql-test/suite/innodb/t/innodb_mysql.test index 6fdd2d5e7dc..38f2ee5f332 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql.test +++ b/mysql-test/suite/innodb/t/innodb_mysql.test @@ -970,7 +970,6 @@ UPDATE t1 SET y = 1 WHERE x = 1; COMMIT; disconnect con2; ---source include/wait_until_disconnected.inc connection default; COMMIT; DROP TABLE t1; diff --git a/mysql-test/suite/innodb/t/innodb_notembedded.test b/mysql-test/suite/innodb/t/innodb_notembedded.test index 79f5606ed6b..f59b73f3494 100644 --- a/mysql-test/suite/innodb/t/innodb_notembedded.test +++ b/mysql-test/suite/innodb/t/innodb_notembedded.test @@ -38,12 +38,8 @@ reap; rollback; # Cleanup -connection a; disconnect a; ---source include/wait_until_disconnected.inc -connection b; disconnect b; ---source include/wait_until_disconnected.inc connection default; drop table t1; drop function f1; diff --git a/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test b/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test index 1cd43dbca7f..e7f7b5859bc 100644 --- a/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test +++ b/mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc CREATE TABLE `t`(`id` INT, PRIMARY KEY(`id`)) ENGINE=InnoDB STATS_PERSISTENT=0; @@ -57,5 +56,3 @@ SET GLOBAL innodb_monitor_enable=default; SET GLOBAL innodb_monitor_disable=default; SET GLOBAL innodb_monitor_reset_all=default; --enable_warnings - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/insert-before-delete.test b/mysql-test/suite/innodb/t/insert-before-delete.test index 1cadbf7c0c6..4c5be4e3a4a 100644 --- a/mysql-test/suite/innodb/t/insert-before-delete.test +++ b/mysql-test/suite/innodb/t/insert-before-delete.test @@ -1,7 +1,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); @@ -73,4 +72,3 @@ SELECT * FROM t; --disconnect pause_purge SET DEBUG_SYNC="RESET"; DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/lock_delete_updated.test b/mysql-test/suite/innodb/t/lock_delete_updated.test index 8697ff595ab..c36422976c7 100644 --- a/mysql-test/suite/innodb/t/lock_delete_updated.test +++ b/mysql-test/suite/innodb/t/lock_delete_updated.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/have_debug.inc --source include/have_debug_sync.inc @@ -33,4 +32,3 @@ connection default; SELECT count(*) FROM t; SET DEBUG_SYNC="reset"; DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/lock_deleted.test b/mysql-test/suite/innodb/t/lock_deleted.test index 8dbad90d354..41ac7c32e6c 100644 --- a/mysql-test/suite/innodb/t/lock_deleted.test +++ b/mysql-test/suite/innodb/t/lock_deleted.test @@ -2,8 +2,6 @@ --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc - connect(stop_purge, localhost, root,,); START TRANSACTION WITH CONSISTENT SNAPSHOT; connect(delete, localhost, root,,); @@ -68,5 +66,3 @@ disconnect stop_purge; connection default; DROP TABLE t1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/lock_isolation.test b/mysql-test/suite/innodb/t/lock_isolation.test index 8b3904ec354..c6f9bd1ac10 100644 --- a/mysql-test/suite/innodb/t/lock_isolation.test +++ b/mysql-test/suite/innodb/t/lock_isolation.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/have_debug.inc --source include/have_debug_sync.inc @@ -254,5 +253,4 @@ SELECT * FROM t WHERE a=1 FOR UPDATE; SET DEBUG_SYNC="RESET"; DROP TABLE t; ---source include/wait_until_count_sessions.inc --echo # End of 10.6 tests diff --git a/mysql-test/suite/innodb/t/lock_move_wait_lock_race.test b/mysql-test/suite/innodb/t/lock_move_wait_lock_race.test index e386a59c01f..be24f981651 100644 --- a/mysql-test/suite/innodb/t/lock_move_wait_lock_race.test +++ b/mysql-test/suite/innodb/t/lock_move_wait_lock_race.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/have_debug.inc --source include/have_debug_sync.inc @@ -56,4 +55,3 @@ SET DEBUG_SYNC="now SIGNAL trx2_cont"; --connection default SET DEBUG_SYNC="RESET"; DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/lock_update_split_rc.test b/mysql-test/suite/innodb/t/lock_update_split_rc.test index 38910e53ef3..dad9f48bc3d 100644 --- a/mysql-test/suite/innodb/t/lock_update_split_rc.test +++ b/mysql-test/suite/innodb/t/lock_update_split_rc.test @@ -1,6 +1,5 @@ --source include/have_innodb.inc --source include/have_debug.inc ---source include/count_sessions.inc CREATE TABLE t ( `a` INT NOT NULL, @@ -72,5 +71,3 @@ DROP TABLE t; --disable_query_log SET GLOBAL innodb_limit_optimistic_insert_debug = @old_innodb_limit_optimistic_insert_debug; --enable_query_log - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/mdev-14846.test b/mysql-test/suite/innodb/t/mdev-14846.test index fac010871fe..fb993e99aa6 100644 --- a/mysql-test/suite/innodb/t/mdev-14846.test +++ b/mysql-test/suite/innodb/t/mdev-14846.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/have_debug_sync.inc --source include/innodb_stable_estimates.inc diff --git a/mysql-test/suite/innodb/t/mon_lock_wait_current_count.test b/mysql-test/suite/innodb/t/mon_lock_wait_current_count.test index 5c2cc7d7d4a..854cad0c255 100644 --- a/mysql-test/suite/innodb/t/mon_lock_wait_current_count.test +++ b/mysql-test/suite/innodb/t/mon_lock_wait_current_count.test @@ -4,7 +4,6 @@ --source include/have_innodb.inc --source include/have_debug.inc ---source include/count_sessions.inc --connect (prevent_purge,localhost,root,,) START TRANSACTION WITH CONSISTENT SNAPSHOT; @@ -94,4 +93,3 @@ SET GLOBAL innodb_monitor_reset_all=default; SET GLOBAL innodb_monitor_enable=default; --enable_warnings --disconnect prevent_purge ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/page_reorganize.test b/mysql-test/suite/innodb/t/page_reorganize.test index f90da5c5d0e..31456e51d03 100644 --- a/mysql-test/suite/innodb/t/page_reorganize.test +++ b/mysql-test/suite/innodb/t/page_reorganize.test @@ -2,8 +2,6 @@ --source include/have_innodb_16k.inc --source include/have_debug.inc ---source include/count_sessions.inc - --echo # --echo # Bug# 20005279 ASSERT !OTHER_LOCK, LOCK_MOVE_REORGANIZE_PAGE() --echo # @@ -60,5 +58,3 @@ CREATE TABLE t1(a INT PRIMARY KEY, b INT UNIQUE) ENGINE=InnoDB; SET DEBUG_DBUG = '+d,do_page_reorganize'; INSERT INTO t1 VALUES(0,0); DROP TABLE t1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/purge_pessimistic.test b/mysql-test/suite/innodb/t/purge_pessimistic.test index 88be65a6be5..ba5a20ff8e8 100644 --- a/mysql-test/suite/innodb/t/purge_pessimistic.test +++ b/mysql-test/suite/innodb/t/purge_pessimistic.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/have_debug.inc --source include/have_debug_sync.inc --source include/not_embedded.inc @@ -38,7 +37,6 @@ COMMIT; --source include/wait_all_purged.inc --disconnect con1 ---source include/wait_until_count_sessions.inc SELECT * FROM t1; CHECK TABLE t1; diff --git a/mysql-test/suite/innodb/t/stats_persistent.test b/mysql-test/suite/innodb/t/stats_persistent.test index 8561298c4d3..38dd4806df4 100644 --- a/mysql-test/suite/innodb/t/stats_persistent.test +++ b/mysql-test/suite/innodb/t/stats_persistent.test @@ -1,7 +1,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --echo # --echo # MDEV-23991 dict_table_stats_lock() has unnecessarily long scope @@ -24,5 +23,3 @@ SET DEBUG_SYNC='now SIGNAL go'; --reap SET DEBUG_SYNC= 'RESET'; DROP TABLE t1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/tmpdir.test b/mysql-test/suite/innodb/t/tmpdir.test index b43a02363dc..da23aa3239d 100644 --- a/mysql-test/suite/innodb/t/tmpdir.test +++ b/mysql-test/suite/innodb/t/tmpdir.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --echo # --echo # Bug #19183565 CREATE DYNAMIC INNODB_TMPDIR VARIABLE TO CONTROL @@ -57,5 +56,3 @@ disconnect con3; connection default; set global innodb_tmpdir=NULL; drop table t1; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/trigger.test b/mysql-test/suite/innodb/t/trigger.test index fe0bab21497..9efeadac68d 100644 --- a/mysql-test/suite/innodb/t/trigger.test +++ b/mysql-test/suite/innodb/t/trigger.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t2 (b INT) ENGINE=InnoDB; @@ -43,5 +42,3 @@ SELECT * FROM t3; DROP TABLE t1, t2, t3; --error ER_TRG_DOES_NOT_EXIST DROP TRIGGER tr; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/trx_sys_t_find_lf_hash_error.test b/mysql-test/suite/innodb/t/trx_sys_t_find_lf_hash_error.test index 833919f9ad6..9425f48e1b9 100644 --- a/mysql-test/suite/innodb/t/trx_sys_t_find_lf_hash_error.test +++ b/mysql-test/suite/innodb/t/trx_sys_t_find_lf_hash_error.test @@ -1,7 +1,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc create table t1 (a int) engine=innodb STATS_PERSISTENT=0; create table t2 (a int) engine=innodb STATS_PERSISTENT=0; @@ -83,5 +82,3 @@ DROP TABLE t1; DROP TABLE t2; SET DEBUG_SYNC="reset"; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/update-cascade.test b/mysql-test/suite/innodb/t/update-cascade.test index 69e81ac4a2f..dd887d03b40 100644 --- a/mysql-test/suite/innodb/t/update-cascade.test +++ b/mysql-test/suite/innodb/t/update-cascade.test @@ -2,9 +2,6 @@ --source include/have_debug.inc --source include/have_debug_sync.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - --echo # --echo # Bug #18451287 REDUNDANT DELETE MARKING AFTER DB_LOCK_WAIT --echo # @@ -216,6 +213,3 @@ commit; drop table t3, t2, t1; set debug_sync = reset; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/xa_prepare_reset_supremum_lock.test b/mysql-test/suite/innodb/t/xa_prepare_reset_supremum_lock.test index 180e44d05ae..3b9a6f7e06f 100644 --- a/mysql-test/suite/innodb/t/xa_prepare_reset_supremum_lock.test +++ b/mysql-test/suite/innodb/t/xa_prepare_reset_supremum_lock.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc CREATE TABLE t ( `a` INT NOT NULL, @@ -45,4 +44,3 @@ INSERT INTO t VALUES (30); --connection default XA COMMIT '1'; DROP TABLE t; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/xa_prepare_unlock_unmodified.test b/mysql-test/suite/innodb/t/xa_prepare_unlock_unmodified.test index 2e5aeef3c3d..d22657352dd 100644 --- a/mysql-test/suite/innodb/t/xa_prepare_unlock_unmodified.test +++ b/mysql-test/suite/innodb/t/xa_prepare_unlock_unmodified.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/have_debug.inc --source include/have_sequence.inc @@ -95,4 +94,3 @@ $$ DELIMITER ;$$ DROP TABLE t1; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/xa_unlock_unmodified.test b/mysql-test/suite/innodb/t/xa_unlock_unmodified.test index 15dabe24162..06848addb9c 100644 --- a/mysql-test/suite/innodb/t/xa_unlock_unmodified.test +++ b/mysql-test/suite/innodb/t/xa_unlock_unmodified.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc --source include/have_debug.inc --source include/have_debug_sync.inc @@ -82,5 +81,3 @@ DROP TABLE t; SET GLOBAL innodb_enable_xap_unlock_unmodified_for_primary_debug= @old_innodb_enable_xap_unlock_unmodified_for_primary_debug; - ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test b/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test index f9a67d74191..7ba48c5f91b 100644 --- a/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test +++ b/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test @@ -573,8 +573,6 @@ SELECT * FROM t1 --disconnect con1 --disconnect con2 ---source include/wait_until_disconnected.inc - --connection default DROP TABLE t1; @@ -670,8 +668,6 @@ SELECT * FROM t1; --disconnect con1 --disconnect con2 ---source include/wait_until_disconnected.inc - --connection default DROP TABLE t1; @@ -788,8 +784,6 @@ SELECT * FROM t1; --disconnect con1 --disconnect con2 ---source include/wait_until_disconnected.inc - --connection default DROP TABLE t1; @@ -885,8 +879,6 @@ SELECT * FROM t1; --disconnect con1 --disconnect con2 ---source include/wait_until_disconnected.inc - --connection default DROP TABLE t1; @@ -1002,8 +994,5 @@ SELECT * FROM t1; --disconnect con1 --disconnect con2 ---source include/wait_until_disconnected.inc - - --connection default DROP TABLE t1; diff --git a/mysql-test/suite/innodb_fts/t/misc_debug.test b/mysql-test/suite/innodb_fts/t/misc_debug.test index d52ee8d8576..76b54a69f15 100644 --- a/mysql-test/suite/innodb_fts/t/misc_debug.test +++ b/mysql-test/suite/innodb_fts/t/misc_debug.test @@ -6,7 +6,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/count_sessions.inc --source include/maybe_versioning.inc # Following test is for Bug 14668777 - ASSERT ON IB_VECTOR_SIZE( @@ -94,7 +93,6 @@ SET DEBUG_SYNC=RESET; ALTER TABLE t1 ADD bl INT AS (LENGTH(b)) VIRTUAL; CHECK TABLE t1; DROP TABLE t1; ---source include/wait_until_count_sessions.inc } --echo # diff --git a/mysql-test/suite/innodb_fts/t/stopword.test b/mysql-test/suite/innodb_fts/t/stopword.test index 4e9a118b873..3239c722339 100644 --- a/mysql-test/suite/innodb_fts/t/stopword.test +++ b/mysql-test/suite/innodb_fts/t/stopword.test @@ -598,7 +598,6 @@ SELECT * FROM articles WHERE MATCH(title,body) AGAINST("+when" IN BOOLEAN MODE); SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('the'); disconnect con1; ---source include/wait_until_disconnected.inc --echo "In connection default" --connection default diff --git a/mysql-test/suite/innodb_fts/t/sync_block.test b/mysql-test/suite/innodb_fts/t/sync_block.test index aa1331c4abf..f90b6ecaeb8 100644 --- a/mysql-test/suite/innodb_fts/t/sync_block.test +++ b/mysql-test/suite/innodb_fts/t/sync_block.test @@ -6,7 +6,6 @@ --source include/have_debug.inc --source include/have_debug_sync.inc --source include/have_log_bin.inc ---source include/count_sessions.inc SET @old_log_output = @@global.log_output; SET @old_slow_query_log = @@global.slow_query_log; @@ -115,8 +114,6 @@ DROP TABLE t1,t2; disconnect con1; disconnect con2; ---source include/wait_until_count_sessions.inc - -- echo # Restore slow log settings. SET GLOBAL log_output = @old_log_output; SET GLOBAL general_log = @old_general_log; diff --git a/mysql-test/suite/innodb_gis/t/0.test b/mysql-test/suite/innodb_gis/t/0.test index c482d881732..6f638be6183 100644 --- a/mysql-test/suite/innodb_gis/t/0.test +++ b/mysql-test/suite/innodb_gis/t/0.test @@ -29,14 +29,9 @@ set transaction isolation level read uncommitted; select count(*) from t1 where ST_Within(t1.c2, @g1); --enable_ps2_protocol disconnect con1; - ---source include/wait_until_disconnected.inc - connection a; commit; disconnect a; ---source include/wait_until_disconnected.inc - connection default; drop table t1; diff --git a/mysql-test/suite/innodb_gis/t/repeatable_spatial.test b/mysql-test/suite/innodb_gis/t/repeatable_spatial.test index ec40bca4f72..f28c18224d9 100644 --- a/mysql-test/suite/innodb_gis/t/repeatable_spatial.test +++ b/mysql-test/suite/innodb_gis/t/repeatable_spatial.test @@ -95,7 +95,6 @@ SELECT COUNT(*) FROM tab; COMMIT; disconnect con2; ---source include/wait_until_disconnected.inc --echo "In connection 1" connection con1; @@ -120,8 +119,6 @@ SELECT COUNT(*) FROM tab; SELECT c1,ST_AsText(c2),ST_AsText(c4),ST_AsText(c5) FROM tab; disconnect con1; ---source include/wait_until_disconnected.inc - --connection default DROP TABLE tab; @@ -210,7 +207,6 @@ SELECT COUNT(*) FROM tab; COMMIT; disconnect con2; ---source include/wait_until_disconnected.inc --echo "In connection 1" connection con1; @@ -235,7 +231,5 @@ SELECT COUNT(*) FROM tab; SELECT c1,ST_AsText(c2),ST_AsText(c4),ST_AsText(c5) FROM tab; disconnect con1; ---source include/wait_until_disconnected.inc - --connection default DROP TABLE tab; diff --git a/mysql-test/suite/innodb_gis/t/rtree_undo.test b/mysql-test/suite/innodb_gis/t/rtree_undo.test index 9126b96d3b0..640b4432685 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_undo.test +++ b/mysql-test/suite/innodb_gis/t/rtree_undo.test @@ -4,7 +4,6 @@ # --source include/innodb_row_format.inc ---source include/count_sessions.inc connect (control_purge,localhost,root,,); connection default; @@ -96,4 +95,3 @@ dec $index; } disconnect control_purge; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/mariabackup/backup_lock_wait_timeout.test b/mysql-test/suite/mariabackup/backup_lock_wait_timeout.test index e0f43910ef6..10887639dc4 100644 --- a/mysql-test/suite/mariabackup/backup_lock_wait_timeout.test +++ b/mysql-test/suite/mariabackup/backup_lock_wait_timeout.test @@ -1,5 +1,4 @@ --source include/have_innodb.inc ---source include/count_sessions.inc CREATE TABLE t(i INT) ENGINE INNODB; @@ -25,4 +24,3 @@ COMMIT; DROP TABLE t; rmdir $targetdir; ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/merge/merge.result b/mysql-test/suite/merge/merge.result index c5a22fe7bae..367c1736519 100644 --- a/mysql-test/suite/merge/merge.result +++ b/mysql-test/suite/merge/merge.result @@ -3898,10 +3898,7 @@ f foo bar DROP TABLE mrg, t1; -End of 10.5 tests -# -# End of 10.0 tests -# +# End of 10.5 tests # # MDEV-27407 Different ASC/DESC index attributes on MERGE and underlying table can cause wrong results # diff --git a/mysql-test/suite/merge/merge.test b/mysql-test/suite/merge/merge.test index 0d4764142a7..9f284b4d8b1 100644 --- a/mysql-test/suite/merge/merge.test +++ b/mysql-test/suite/merge/merge.test @@ -4,9 +4,6 @@ --source include/test_db_charset_latin1.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - # MERGE tables require MyISAM tables set @save_default_storage_engine=@@global.default_storage_engine; set global default_storage_engine=myisam; @@ -2846,10 +2843,6 @@ DROP TABLE m1; set global default_storage_engine=@save_default_storage_engine; -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc - --echo # --echo # MDEV-31083 ASAN use-after-poison in myrg_attach_children --echo # @@ -2860,11 +2853,7 @@ CREATE TABLE mrg (f TEXT) ENGINE=MERGE, UNION(t1); SELECT * FROM mrg; DROP TABLE mrg, t1; ---echo End of 10.5 tests - ---echo # ---echo # End of 10.0 tests ---echo # +--echo # End of 10.5 tests --echo # --echo # MDEV-27407 Different ASC/DESC index attributes on MERGE and underlying table can cause wrong results diff --git a/mysql-test/suite/perfschema/include/cleanup_helper.inc b/mysql-test/suite/perfschema/include/cleanup_helper.inc index 24b2cbec11e..9390ccb3d6d 100644 --- a/mysql-test/suite/perfschema/include/cleanup_helper.inc +++ b/mysql-test/suite/perfschema/include/cleanup_helper.inc @@ -3,15 +3,8 @@ update performance_schema.setup_instruments set enabled='YES'; -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc -connection con2; disconnect con2; ---source include/wait_until_disconnected.inc -connection con3; disconnect con3; ---source include/wait_until_disconnected.inc - connection default; diff --git a/mysql-test/suite/perfschema/include/socket_event_dbg.inc b/mysql-test/suite/perfschema/include/socket_event_dbg.inc index 75c4d4808cb..3df6941a984 100644 --- a/mysql-test/suite/perfschema/include/socket_event_dbg.inc +++ b/mysql-test/suite/perfschema/include/socket_event_dbg.inc @@ -115,9 +115,7 @@ if($is_connect) { if(!$my_errno) { - --connection con1 --disconnect con1 - --source include/wait_until_disconnected.inc --connection default } } diff --git a/mysql-test/suite/perfschema/include/socket_ipv6.inc b/mysql-test/suite/perfschema/include/socket_ipv6.inc index 0c9f47abe47..1b8dc055bc4 100644 --- a/mysql-test/suite/perfschema/include/socket_ipv6.inc +++ b/mysql-test/suite/perfschema/include/socket_ipv6.inc @@ -39,7 +39,6 @@ if($mysql_errno) if(!$mysql_errno) { disconnect checkcon123456789; - --source include/wait_until_disconnected.inc } connection default; @@ -83,7 +82,6 @@ if($mysql_errno) if(!$mysql_errno) { disconnect checkcon123456789a; - --source include/wait_until_disconnected.inc } connection default; diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc index 30e33ebb5f1..3b0e09792fb 100644 --- a/mysql-test/suite/perfschema/include/upgrade_check.inc +++ b/mysql-test/suite/perfschema/include/upgrade_check.inc @@ -2,9 +2,7 @@ # $out_file and $err_file must be set within pfs_upgrade.test. # ---source include/count_sessions.inc --exec $MYSQL_UPGRADE --skip-verbose --force > $MYSQLTEST_VARDIR/tmp/out_file 2> $MYSQLTEST_VARDIR/tmp/err_file ---source include/wait_until_count_sessions.inc # Verify that mysql_upgrade does not complain about the performance_schema diff --git a/mysql-test/suite/perfschema/r/one_thread_per_con.result b/mysql-test/suite/perfschema/r/one_thread_per_con.result index 649243db831..0fd2ba64ccb 100644 --- a/mysql-test/suite/perfschema/r/one_thread_per_con.result +++ b/mysql-test/suite/perfschema/r/one_thread_per_con.result @@ -40,10 +40,7 @@ drop table test.t1; drop table test.t2; drop table test.t3; update performance_schema.setup_instruments set enabled='YES'; -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; diff --git a/mysql-test/suite/perfschema/r/read_only.result b/mysql-test/suite/perfschema/r/read_only.result index 666c100d958..ad4d4ea7e4f 100644 --- a/mysql-test/suite/perfschema/r/read_only.result +++ b/mysql-test/suite/perfschema/r/read_only.result @@ -30,7 +30,9 @@ GRANT USAGE ON *.* TO `pfsuser`@`localhost` GRANT SELECT, UPDATE ON `performance_schema`.* TO `pfsuser`@`localhost` select * from performance_schema.setup_instruments; update performance_schema.setup_instruments set enabled='NO'; +ERROR HY000: The MariaDB server is running with the --read-only=ON option so it cannot execute this statement update performance_schema.setup_instruments set enabled='YES'; +ERROR HY000: The MariaDB server is running with the --read-only=ON option so it cannot execute this statement connection default; grant READ_ONLY ADMIN on *.* to pfsuser@localhost; flush privileges; diff --git a/mysql-test/suite/perfschema/r/socket_connect.result b/mysql-test/suite/perfschema/r/socket_connect.result index 5de362bf370..3fe799e5c75 100644 --- a/mysql-test/suite/perfschema/r/socket_connect.result +++ b/mysql-test/suite/perfschema/r/socket_connect.result @@ -154,10 +154,8 @@ Expect 2 # 5.0 Drop the client connections #============================================================================== # 5.1 Disconnect con1 -connection con1; disconnect con1; # 5.2 Disconnect con2 -connection con2; disconnect con2; connection default; #============================================================================== diff --git a/mysql-test/suite/perfschema/r/socket_instances_func.result b/mysql-test/suite/perfschema/r/socket_instances_func.result index 2f215ca6414..48da2be8be0 100644 --- a/mysql-test/suite/perfschema/r/socket_instances_func.result +++ b/mysql-test/suite/perfschema/r/socket_instances_func.result @@ -199,11 +199,8 @@ wait/io/socket/sql/client_connection wait/io/socket/sql/client_connection wait/io/socket/sql/client_connection connection default; -connection con1; disconnect con1; -connection con2; disconnect con2; -connection con3; disconnect con3; connection default; # After waiting a bit we should have no differences to socket_instances diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result b/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result index 611038f886e..ed9bf2b831a 100644 --- a/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result +++ b/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result @@ -117,12 +117,10 @@ consistent with totals in socket_summary_by_instance # # 5.1 Disconnect con1 # -connection con1; disconnect con1; # # 5.2 Disconnect con2 # -connection con2; disconnect con2; # # 5.3 Drop mysqltest diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result index 39b668541c5..b58a14316e4 100644 --- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result +++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result @@ -219,4 +219,3 @@ connection default; # It must reset all counters. TRUNCATE TABLE performance_schema.socket_summary_by_instance; # 6. Cleanup -connection default; diff --git a/mysql-test/suite/perfschema/r/threads_history.result b/mysql-test/suite/perfschema/r/threads_history.result index d72ace62255..b5d675adbc6 100644 --- a/mysql-test/suite/perfschema/r/threads_history.result +++ b/mysql-test/suite/perfschema/r/threads_history.result @@ -951,10 +951,6 @@ where THREAD_ID = $con4_thread_id; count(*) 0 connection default; -revoke all privileges, grant option from user1@localhost; -revoke all privileges, grant option from user2@localhost; -revoke all privileges, grant option from user3@localhost; -revoke all privileges, grant option from user4@localhost; drop user user1@localhost; drop user user2@localhost; drop user user3@localhost; diff --git a/mysql-test/suite/perfschema/r/transaction_nested_events.result b/mysql-test/suite/perfschema/r/transaction_nested_events.result index 52fa3783a8b..71d61d1e2c6 100644 --- a/mysql-test/suite/perfschema/r/transaction_nested_events.result +++ b/mysql-test/suite/perfschema/r/transaction_nested_events.result @@ -1272,7 +1272,6 @@ DELETE FROM db.t1; #======================================================================= # Cleanup #======================================================================= -connection con1; disconnect con1; connection default; DROP DATABASE db; diff --git a/mysql-test/suite/perfschema/t/connect_attrs.test b/mysql-test/suite/perfschema/t/connect_attrs.test index 0e7933670f0..fc9b7898041 100644 --- a/mysql-test/suite/perfschema/t/connect_attrs.test +++ b/mysql-test/suite/perfschema/t/connect_attrs.test @@ -6,10 +6,6 @@ # TODO: remove this when P_S works with embedded. --source include/not_embedded.inc -# make sure we're alone -let $count_sessions= 1; ---source include/wait_until_count_sessions.inc - # basic performance_schema.session_connect_attrs tests # check the presence of the pre-defined attributes @@ -78,6 +74,3 @@ SELECT SUM(ISNULL(ATTR_VALUE)), COUNT(*) change_user root,,test; DROP USER wl5924@localhost; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/perfschema/t/global_read_lock.test b/mysql-test/suite/perfschema/t/global_read_lock.test index 430d6eed5dc..73da5e18f93 100644 --- a/mysql-test/suite/perfschema/t/global_read_lock.test +++ b/mysql-test/suite/perfschema/t/global_read_lock.test @@ -69,7 +69,6 @@ update performance_schema.setup_instruments set enabled='YES'; unlock tables; disconnect con1; ---source include/wait_until_disconnected.inc connection default; diff --git a/mysql-test/suite/perfschema/t/misc_global_status.test b/mysql-test/suite/perfschema/t/misc_global_status.test index ee9a9f9c78e..5f39ac098e7 100644 --- a/mysql-test/suite/perfschema/t/misc_global_status.test +++ b/mysql-test/suite/perfschema/t/misc_global_status.test @@ -96,10 +96,6 @@ SELECT `USER`, `HOST`, VARIABLE_NAME, VARIABLE_VALUE --disconnect con1 --disconnect con2 -# Wait till all disconnects are completed -let $count_sessions= 2; ---source include/wait_until_count_sessions.inc - --disable_query_log eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range'; --enable_query_log @@ -112,10 +108,6 @@ eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance --disconnect con3 -# Wait till all disconnects are completed -let $count_sessions= 1; ---source include/wait_until_count_sessions.inc - --disable_query_log eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range'; --enable_query_log diff --git a/mysql-test/suite/perfschema/t/privilege.test b/mysql-test/suite/perfschema/t/privilege.test index 75accb3dfe2..f11fb96cb9c 100644 --- a/mysql-test/suite/perfschema/t/privilege.test +++ b/mysql-test/suite/perfschema/t/privilege.test @@ -316,7 +316,6 @@ TRUNCATE TABLE performance_schema.events_waits_current; --echo # Clean up --disconnect pfs_user_4 ---source include/wait_until_disconnected.inc --connection default REVOKE ALL PRIVILEGES, GRANT OPTION FROM pfs_user_4; DROP USER pfs_user_4; diff --git a/mysql-test/suite/perfschema/t/read_only.test b/mysql-test/suite/perfschema/t/read_only.test index 4cbaad0de6b..935a629e891 100644 --- a/mysql-test/suite/perfschema/t/read_only.test +++ b/mysql-test/suite/perfschema/t/read_only.test @@ -43,11 +43,11 @@ select @@global.read_only; show grants; --disable_result_log select * from performance_schema.setup_instruments; +--enable_result_log --error ER_OPTION_PREVENTS_STATEMENT update performance_schema.setup_instruments set enabled='NO'; --error ER_OPTION_PREVENTS_STATEMENT update performance_schema.setup_instruments set enabled='YES'; ---enable_result_log connection default; @@ -61,13 +61,11 @@ select @@global.read_only; show grants; --disable_result_log select * from performance_schema.setup_instruments; +--enable_result_log update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; ---enable_result_log disconnect con1; ---source include/wait_until_disconnected.inc - connection default; set global read_only= @start_read_only; diff --git a/mysql-test/suite/perfschema/t/setup_actors.test b/mysql-test/suite/perfschema/t/setup_actors.test index ff0aa87472c..2efe7b0ba13 100644 --- a/mysql-test/suite/perfschema/t/setup_actors.test +++ b/mysql-test/suite/perfschema/t/setup_actors.test @@ -203,9 +203,6 @@ select * from performance_schema.threads; select * from test.v1; --disconnect con5 ---source include/wait_until_disconnected.inc - - --connection default drop view test.v1; diff --git a/mysql-test/suite/perfschema/t/show_coverage.test b/mysql-test/suite/perfschema/t/show_coverage.test index 6357c99a6f3..3a90712164f 100644 --- a/mysql-test/suite/perfschema/t/show_coverage.test +++ b/mysql-test/suite/perfschema/t/show_coverage.test @@ -7,7 +7,6 @@ --source include/have_perfschema.inc --source include/not_embedded.inc --source include/no_protocol.inc ---source include/count_sessions.inc --echo # --echo # TEST 1 @@ -106,7 +105,6 @@ SELECT @bytes_before > @bytes_after AS 'Expect 1'; SELECT @bytes_after AS 'Expect 0'; disconnect con1; ---source include/wait_until_count_sessions.inc --echo # @@ -119,8 +117,6 @@ disconnect con1; --echo # Default connection --let $initial_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1) ---source include/count_sessions.inc - --echo # --echo # First connection --connect (con1, localhost, root,,) @@ -151,7 +147,6 @@ SET long_query_time = @@global.long_query_time; --connection default --disconnect con1 ---source include/wait_until_count_sessions.inc --echo # --echo # Default connection diff --git a/mysql-test/suite/perfschema/t/show_plugin.test b/mysql-test/suite/perfschema/t/show_plugin.test index 7109c3140c6..959363d04cc 100644 --- a/mysql-test/suite/perfschema/t/show_plugin.test +++ b/mysql-test/suite/perfschema/t/show_plugin.test @@ -26,14 +26,10 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc ---enable_connect_log - --echo # --echo # ================================================================================ --echo # SETUP --echo # ================================================================================ ---echo # Save the initial number of concurrent sessions ---source include/count_sessions.inc --echo # --echo # Verify EXAMPLE plugin is not loaded SELECT COUNT(*) = 0 AS "Expect 1" FROM information_schema.plugins WHERE plugin_name = "EXAMPLE"; @@ -181,18 +177,9 @@ WHERE variable_name LIKE "example_%" ORDER BY variable_value; --echo # ================================================================================ --echo # 3.5 - DISCONNECT CLIENTS --echo # ================================================================================ ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc - ---connection con2 --disconnect con2 ---source include/wait_until_disconnected.inc - ---connection con3 --disconnect con3 ---source include/wait_until_disconnected.inc - --connection default --echo # @@ -250,18 +237,9 @@ WHERE variable_name LIKE "example_%" ORDER BY variable_value; --echo # ================================================================================ --echo # 3.11 - DISCONNECT CLIENTS --echo # ================================================================================ ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc - ---connection con2 --disconnect con2 ---source include/wait_until_disconnected.inc - ---connection con3 --disconnect con3 ---source include/wait_until_disconnected.inc - --connection default --echo # @@ -314,8 +292,3 @@ select @@session.innodb_strict_mode; --echo # --echo # ---disable_connect_log - ---echo # ---echo # Wait till we reached the initial number of concurrent sessions ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/perfschema/t/socket_connect.test b/mysql-test/suite/perfschema/t/socket_connect.test index 3eae8fe2680..543f12bffe5 100644 --- a/mysql-test/suite/perfschema/t/socket_connect.test +++ b/mysql-test/suite/perfschema/t/socket_connect.test @@ -257,14 +257,10 @@ WHERE EVENT_NAME LIKE '%client_connection%' --echo #============================================================================== --echo # 5.1 Disconnect con1 ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc --echo # 5.2 Disconnect con2 ---connection con2 --disconnect con2 ---source include/wait_until_disconnected.inc --connection default --echo #============================================================================== diff --git a/mysql-test/suite/perfschema/t/socket_instances_func.test b/mysql-test/suite/perfschema/t/socket_instances_func.test index 266080fc696..01ba7228172 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func.test +++ b/mysql-test/suite/perfschema/t/socket_instances_func.test @@ -436,15 +436,9 @@ $part; # DROP CLIENT CONNECTIONS # ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc ---connection con2 --disconnect con2 ---source include/wait_until_disconnected.inc ---connection con3 --disconnect con3 ---source include/wait_until_disconnected.inc --connection default # diff --git a/mysql-test/suite/perfschema/t/socket_instances_func_win.test b/mysql-test/suite/perfschema/t/socket_instances_func_win.test index 24774a51fa2..a2ca584f2c4 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_instances_func_win.test @@ -327,12 +327,8 @@ $part; # --echo # Disconnect con1 and con2 ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc ---connection con2 --disconnect con2 ---source include/wait_until_disconnected.inc --connection default # diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test index 10ed6c7e380..fe5200d4ef9 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test @@ -317,16 +317,12 @@ if (`SELECT @tables_match = 0`) --echo # --echo # 5.1 Disconnect con1 --echo # ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc --echo # --echo # 5.2 Disconnect con2 --echo # ---connection con2 --disconnect con2 ---source include/wait_until_disconnected.inc --echo # --echo # 5.3 Drop mysqltest diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test index 5a82037c11c..f600fa2ad1d 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test @@ -1680,8 +1680,6 @@ if($print_details) --disable_query_log DROP SCHEMA mysqltest; DROP SCHEMA mysqlsupertest; ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc --connection default --enable_query_log diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test index 207f4d73cf5..8b9e5c7641a 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test @@ -1696,9 +1696,6 @@ if($print_details) --disable_query_log DROP SCHEMA mysqltest; DROP SCHEMA mysqlsupertest; ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc --connection default --enable_query_log - diff --git a/mysql-test/suite/perfschema/t/statement_program_concurrency.test b/mysql-test/suite/perfschema/t/statement_program_concurrency.test index 8229223caec..c93370c1346 100644 --- a/mysql-test/suite/perfschema/t/statement_program_concurrency.test +++ b/mysql-test/suite/perfschema/t/statement_program_concurrency.test @@ -13,9 +13,6 @@ TRUNCATE TABLE performance_schema.events_statements_history; --echo # concurrency check through multi connections -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - CREATE DATABASE db1; CREATE DATABASE db2; CREATE DATABASE db3; @@ -127,6 +124,3 @@ DROP DATABASE db3; disconnect con1; disconnect con2; disconnect con3; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/perfschema/t/threads_history.test b/mysql-test/suite/perfschema/t/threads_history.test index aee983339d2..ddfc9edad50 100644 --- a/mysql-test/suite/perfschema/t/threads_history.test +++ b/mysql-test/suite/perfschema/t/threads_history.test @@ -650,10 +650,6 @@ evalp select /*4-3*/ count(*) from performance_schema.events_waits_history_long --connection default -revoke all privileges, grant option from user1@localhost; -revoke all privileges, grant option from user2@localhost; -revoke all privileges, grant option from user3@localhost; -revoke all privileges, grant option from user4@localhost; drop user user1@localhost; drop user user2@localhost; drop user user3@localhost; diff --git a/mysql-test/suite/perfschema/t/transaction.test b/mysql-test/suite/perfschema/t/transaction.test index 19dab50bbb7..4ed20289f0f 100644 --- a/mysql-test/suite/perfschema/t/transaction.test +++ b/mysql-test/suite/perfschema/t/transaction.test @@ -702,9 +702,7 @@ CALL transaction_verifier(0, @con2_thread_id, 'transaction', 'ACTIVE', 0, '', '' --echo # --echo ## Drop connection ---connection con2 --disconnect con2 ---source include/wait_until_disconnected.inc --connection default --echo # diff --git a/mysql-test/suite/perfschema/t/transaction_nested_events.test b/mysql-test/suite/perfschema/t/transaction_nested_events.test index 1be7dc0f937..febf1398004 100644 --- a/mysql-test/suite/perfschema/t/transaction_nested_events.test +++ b/mysql-test/suite/perfschema/t/transaction_nested_events.test @@ -374,9 +374,7 @@ eval SET @all_threads= 0; --echo #======================================================================= --echo # Cleanup --echo #======================================================================= ---connection con1 --disconnect con1 ---source include/wait_until_disconnected.inc --connection default DROP DATABASE db; UPDATE performance_schema.setup_instruments SET enabled='YES', timed='YES'; diff --git a/mysql-test/suite/perfschema/t/user_var_func.test b/mysql-test/suite/perfschema/t/user_var_func.test index 3c9ea4f3cf3..493f6522639 100644 --- a/mysql-test/suite/perfschema/t/user_var_func.test +++ b/mysql-test/suite/perfschema/t/user_var_func.test @@ -29,10 +29,6 @@ select VARIABLE_NAME, VARIABLE_VALUE --connection default --disconnect con1 -# Wait till all disconnects are completed -let $count_sessions= 1; ---source include/wait_until_count_sessions.inc - select VARIABLE_NAME, VARIABLE_VALUE from performance_schema.user_variables_by_thread order by VARIABLE_NAME; diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test index 7987493bac2..3166e1eadd6 100644 --- a/mysql-test/suite/plugins/t/server_audit.test +++ b/mysql-test/suite/plugins/t/server_audit.test @@ -188,8 +188,6 @@ set global server_audit_logging= off; set global server_audit_incl_users='root'; set global server_audit_logging= on; disconnect cn1; -let $count_sessions=1; -source include/wait_until_count_sessions.inc; drop user user1@localhost; @@ -209,8 +207,6 @@ connect(plug_con,localhost,plug,plug_dest,"*NO-ONE*"); select USER(),CURRENT_USER(); connection default; disconnect plug_con; ---sleep 2 ---sleep 2 DROP USER plug; DROP USER plug_dest; @@ -221,7 +217,6 @@ connect (conssl1,localhost,ssl_user1,,sa_db,,,SSL); select variable_value > '' as 'have_ssl' from information_schema.session_status where variable_name='ssl_cipher'; disconnect conssl1; connection default; ---sleep 2 DROP USER ssl_user1@localhost; set global server_audit_query_log_limit= 15; diff --git a/mysql-test/suite/roles/drop_routines.test b/mysql-test/suite/roles/drop_routines.test index b5972d8d9f9..641081af4f2 100644 --- a/mysql-test/suite/roles/drop_routines.test +++ b/mysql-test/suite/roles/drop_routines.test @@ -63,7 +63,6 @@ set role r1; select mysql.test_func("r1"); connection default; - 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 043f79f8f7f..4af3343bdf4 100644 --- a/mysql-test/suite/roles/flush_roles-12366.result +++ b/mysql-test/suite/roles/flush_roles-12366.result @@ -478,7 +478,7 @@ COUNT(1) SELECT COUNT(1) FROM oms_live_th.d; COUNT(1) 0 -connect con4,localhost,root,,; +connection default; 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 343ac4abf72..6a130859dae 100644 --- a/mysql-test/suite/roles/flush_roles-12366.test +++ b/mysql-test/suite/roles/flush_roles-12366.test @@ -317,8 +317,6 @@ SELECT COUNT(1) FROM oms_live_th.c; SELECT COUNT(1) FROM oms_live_th.d; -connect(con4,localhost,root,,); - DROP DATABASE bob_live_sg; DROP DATABASE oms_live_sg; DROP DATABASE bob_live_ph; diff --git a/mysql-test/suite/roles/grant_empty.test b/mysql-test/suite/roles/grant_empty.test index e419fffa2ba..591a72ea62f 100644 --- a/mysql-test/suite/roles/grant_empty.test +++ b/mysql-test/suite/roles/grant_empty.test @@ -1,3 +1,4 @@ +--source include/not_embedded.inc # # MDEV-5668 Assertion `granted_role->is_role()' fails on granting role with empty name # @@ -7,7 +8,6 @@ grant '' to foo@localhost; # # MDEV-5238 Server crashes in find_role_grant_pair on SHOW GRANTS for an anonymous user # ---source include/not_embedded.inc create user ''@localhost; create role r1; @@ -20,4 +20,3 @@ show grants; connection default; drop role r1; drop user ''@localhost; - diff --git a/mysql-test/suite/roles/role_case_sensitive-10744.test b/mysql-test/suite/roles/role_case_sensitive-10744.test index 281d61bce00..fa904949af9 100644 --- a/mysql-test/suite/roles/role_case_sensitive-10744.test +++ b/mysql-test/suite/roles/role_case_sensitive-10744.test @@ -47,7 +47,6 @@ insert into secret_db.t1 values ("|_33T|-|4><"); connection default; - drop role test_ROLE; drop role test_role; drop user test_user; diff --git a/mysql-test/suite/roles/set_role-13655.test b/mysql-test/suite/roles/set_role-13655.test index ef24bc0f487..6e508c567d9 100644 --- a/mysql-test/suite/roles/set_role-13655.test +++ b/mysql-test/suite/roles/set_role-13655.test @@ -43,7 +43,6 @@ create database t; drop database t; connection default; - drop role simple; drop role admin; drop user foo; diff --git a/mysql-test/suite/roles/set_role-9614.test b/mysql-test/suite/roles/set_role-9614.test index 5e9f7dacf19..91591d38eb2 100644 --- a/mysql-test/suite/roles/set_role-9614.test +++ b/mysql-test/suite/roles/set_role-9614.test @@ -7,7 +7,6 @@ --echo # real issue is actually apparent when the username is longer than the --echo # rolename. ---enable_connect_log --echo # --echo # We need a separate database not including test or test_% names. Due to --echo # default privileges given on these databases. @@ -76,4 +75,3 @@ drop user john; drop user usertestjohn; drop role client; drop database bug_db; ---disable_connect_log diff --git a/mysql-test/suite/roles/show_create_database-10463.test b/mysql-test/suite/roles/show_create_database-10463.test index b1eaaf5ff5a..547f9dd96cd 100644 --- a/mysql-test/suite/roles/show_create_database-10463.test +++ b/mysql-test/suite/roles/show_create_database-10463.test @@ -48,7 +48,6 @@ where table_schema = 'db' order by table_name; connection default; - drop database db; drop role r1; drop user beep; diff --git a/mysql-test/suite/rpl/r/rpl_row_USER.result b/mysql-test/suite/rpl/r/rpl_row_USER.result index 2771c674f44..260681c716a 100644 --- a/mysql-test/suite/rpl/r/rpl_row_USER.result +++ b/mysql-test/suite/rpl/r/rpl_row_USER.result @@ -39,6 +39,5 @@ REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; REVOKE ALL ON mysqltest1.* FROM ''@'localhost%'; DROP USER tester@'%'; DROP USER ''@'localhost%'; -FLUSH PRIVILEGES; connection slave; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_ssl1.result b/mysql-test/suite/rpl/r/rpl_ssl1.result index c6721d2f466..80d27c074de 100644 --- a/mysql-test/suite/rpl/r/rpl_ssl1.result +++ b/mysql-test/suite/rpl/r/rpl_ssl1.result @@ -49,6 +49,7 @@ Master_SSL_CA_File = 'MYSQL_TEST_DIR/std_data/cacert.pem' Master_SSL_Cert = 'MYSQL_TEST_DIR/std_data/client-cert.pem' Master_SSL_Key = 'MYSQL_TEST_DIR/std_data/client-key.pem' include/check_slave_is_running.inc +# End of 4.1 tests connection slave; stop slave; include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/rpl/t/rpl_drop_temp.test b/mysql-test/suite/rpl/t/rpl_drop_temp.test index 86869a560f5..81d57fc0311 100644 --- a/mysql-test/suite/rpl/t/rpl_drop_temp.test +++ b/mysql-test/suite/rpl/t/rpl_drop_temp.test @@ -18,8 +18,6 @@ create temporary table mysqltest.t1 (n int)ENGINE=MyISAM; create temporary table mysqltest.t2 (n int)ENGINE=MyISAM; disconnect con_temp; ---source include/wait_until_disconnected.inc - connection master; if (`SELECT FIND_IN_SET(@@BINLOG_FORMAT,@@CREATE_TMP_TABLE_BINLOG_FORMATS) > 0`) { diff --git a/mysql-test/suite/rpl/t/rpl_drop_temp_table_invalid_lex.test b/mysql-test/suite/rpl/t/rpl_drop_temp_table_invalid_lex.test index af2447d9c6d..f09ea75ce7e 100644 --- a/mysql-test/suite/rpl/t/rpl_drop_temp_table_invalid_lex.test +++ b/mysql-test/suite/rpl/t/rpl_drop_temp_table_invalid_lex.test @@ -25,8 +25,6 @@ CREATE TEMPORARY TABLE tmp (a INT); --send CREATE TABLE non_existing_db.t SELECT 1 AS b --disconnect con1 ---source include/wait_until_disconnected.inc - --connection master if (`SELECT FIND_IN_SET(@@BINLOG_FORMAT,@@CREATE_TMP_TABLE_BINLOG_FORMATS) > 0`) { diff --git a/mysql-test/suite/rpl/t/rpl_parallel_multi_domain_xa.test b/mysql-test/suite/rpl/t/rpl_parallel_multi_domain_xa.test index f17634d4df8..97eb101b257 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_multi_domain_xa.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_multi_domain_xa.test @@ -110,7 +110,6 @@ while ($iter) --let $_k = $k while ($k) { - --source include/count_sessions.inc --connect(con$k,localhost,root,,) # # create XA events alternating gtid domains to run them in parallel on slave. @@ -124,7 +123,6 @@ while ($iter) --disconnect con$k --connection master - --source include/wait_until_count_sessions.inc --dec $k } diff --git a/mysql-test/suite/rpl/t/rpl_row_USER.test b/mysql-test/suite/rpl/t/rpl_row_USER.test index 405f609f0f6..9ca4b0e9231 100644 --- a/mysql-test/suite/rpl/t/rpl_row_USER.test +++ b/mysql-test/suite/rpl/t/rpl_row_USER.test @@ -53,7 +53,6 @@ REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; REVOKE ALL ON mysqltest1.* FROM ''@'localhost%'; DROP USER tester@'%'; DROP USER ''@'localhost%'; -FLUSH PRIVILEGES; --sync_slave_with_master # End of 5.0 test case --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test b/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test index 906cddc9971..a6d3d51cf94 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test @@ -219,7 +219,7 @@ SET GLOBAL debug_dbug="+d,simulate_delay_semisync_slave_reply"; --connection server_2 set debug_sync= "now wait_for io_thd_at_slave_reply"; ---disconnect con1 +--dirty_close con1 --connection default --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect diff --git a/mysql-test/suite/rpl/t/rpl_ssl.test b/mysql-test/suite/rpl/t/rpl_ssl.test index ad9a191d6b5..0d2da4b28fe 100644 --- a/mysql-test/suite/rpl/t/rpl_ssl.test +++ b/mysql-test/suite/rpl/t/rpl_ssl.test @@ -111,6 +111,6 @@ CHANGE MASTER TO master_ssl_cert = '', master_ssl_key = ''; ---echo End of 5.0 tests +--echo # End of 5.0 tests --let $rpl_only_running_threads= 1 --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_ssl1.test b/mysql-test/suite/rpl/t/rpl_ssl1.test index 0caaae251d1..d4ef97d4e7d 100644 --- a/mysql-test/suite/rpl/t/rpl_ssl1.test +++ b/mysql-test/suite/rpl/t/rpl_ssl1.test @@ -67,7 +67,7 @@ drop table t1; sync_slave_with_master; source include/show_slave_status.inc; source include/check_slave_is_running.inc; -# End of 4.1 tests +--echo # End of 4.1 tests # Start replication with ssl_verify_server_cert turned on connection slave; diff --git a/mysql-test/suite/rpl/t/rpl_xa.inc b/mysql-test/suite/rpl/t/rpl_xa.inc index 7fb42d711af..c45770e2cc9 100644 --- a/mysql-test/suite/rpl/t/rpl_xa.inc +++ b/mysql-test/suite/rpl/t/rpl_xa.inc @@ -5,6 +5,7 @@ # --let rpl_xa_check= SELECT ... # connection master; +source include/count_sessions.inc; create table t1 (a int, b int) engine=InnoDB; insert into t1 values(0, 0); xa start 't'; @@ -106,8 +107,6 @@ while ($p_trx) --enable_query_log --disconnect master_$xid - --source include/wait_until_disconnected.inc - --dec $p_trx } @@ -123,13 +122,12 @@ while ($p_trx) --source rpl_create_xa_prepared.inc --enable_cursor_protocol --disconnect master_$xid - --source include/wait_until_disconnected.inc - --dec $p_trx } --echo *** $ro_cases prepared xa:s must be in the list: --connection master +source include/wait_until_count_sessions.inc; sorted_result; xa recover; @@ -172,10 +170,9 @@ set @@sql_log_bin = 1; --let $query=insert into $db.t set a=1 --source rpl_create_xa_prepared.inc --disconnect master_$xid ---source include/wait_until_disconnected.inc - --echo *** $xid must be in the list: --connection master +source include/wait_until_count_sessions.inc; xa recover; --let $complete=`select if(floor(rand()*10)%2,'COMMIT','ROLLBACK')` @@ -216,12 +213,11 @@ create table t3 (a int) engine=innodb; --eval xa prepare '$xid' --disconnect master_$xid - --source include/wait_until_disconnected.inc connection master; --echo *** $xid must be in the list: +source include/wait_until_count_sessions.inc; xa recover; - --let $complete=`select if(floor(rand()*10)%2,'COMMIT','ROLLBACK')` --disable_query_log --disable_result_log @@ -253,8 +249,6 @@ xa recover; --enable_result_log --enable_query_log --disconnect master_$xid ---source include/wait_until_disconnected.inc - --echo *** Zero must be in the list: --connection master xa recover; @@ -283,16 +277,15 @@ create table tm (a int) engine=myisam; --enable_query_log --disconnect master_$xid - --source include/wait_until_disconnected.inc # With disconnect --connection master --source rpl_create_xa_prepared.inc --disconnect master_$xid - --source include/wait_until_disconnected.inc --echo *** $xid prepared must be in the list: --connection master +source include/wait_until_count_sessions.inc; xa recover; --let $complete=`select if(floor(rand()*10)%2,'COMMIT','ROLLBACK')` @@ -325,10 +318,10 @@ set @@session.sql_log_bin = OFF; --eval xa prepare '$xid' --disconnect master_$xid ---source include/wait_until_disconnected.inc --echo *** $xid must be in the list: --connection master +source include/wait_until_count_sessions.inc; xa recover; # now commit it carefully to avoid binlogging as the prepare part did diff --git a/mysql-test/suite/storage_engine/delete_low_prio.test b/mysql-test/suite/storage_engine/delete_low_prio.test index da106791284..0317a1008d5 100644 --- a/mysql-test/suite/storage_engine/delete_low_prio.test +++ b/mysql-test/suite/storage_engine/delete_low_prio.test @@ -3,12 +3,6 @@ # --source have_engine.inc ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - --let $create_definiiton = a $int_col, b $char_col --source create_table.inc INSERT INTO t1 (a,b) VALUES (1,'f'),(2,'b'); @@ -154,7 +148,5 @@ SELECT a,b FROM t1; # Cleanup DROP TABLE t1; ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/insert_delayed.test b/mysql-test/suite/storage_engine/insert_delayed.test index ece0bf3cf68..df25bb40404 100644 --- a/mysql-test/suite/storage_engine/insert_delayed.test +++ b/mysql-test/suite/storage_engine/insert_delayed.test @@ -10,12 +10,6 @@ if (`SELECT @@log_bin AND @@binlog_format IN ('statement','mixed')`) --skip # INSERT DELAYED does not work with binlog format STATEMENT or MIXED } ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - --let $create_definition = a $int_col, b $char_col --source create_table.inc INSERT INTO t1 (a,b) VALUES (1,'f'),(2,'b'); @@ -53,8 +47,5 @@ SELECT a,b FROM t1; # Cleanup DROP TABLE t1; -let $wait_timeout = 30; ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/insert_high_prio.test b/mysql-test/suite/storage_engine/insert_high_prio.test index 7b67a90bc45..80f55c02270 100644 --- a/mysql-test/suite/storage_engine/insert_high_prio.test +++ b/mysql-test/suite/storage_engine/insert_high_prio.test @@ -3,12 +3,6 @@ # --source have_engine.inc ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - # We will be changing the GLOBAL value of low_priority_updates # due to bug#64892 # (Session-level low_priority_updates does not work for INSERT) @@ -135,7 +129,5 @@ SET GLOBAL concurrent_insert = @concur_insert; # Cleanup DROP TABLE t1; ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/insert_low_prio.test b/mysql-test/suite/storage_engine/insert_low_prio.test index 257b54a35f6..f92d5cc0874 100644 --- a/mysql-test/suite/storage_engine/insert_low_prio.test +++ b/mysql-test/suite/storage_engine/insert_low_prio.test @@ -3,12 +3,6 @@ # --source have_engine.inc ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - # We will be changing the GLOBAL value of low_priority_updates # due to bug#64892 # (Session-level low_priority_updates does not work for INSERT) @@ -87,7 +81,5 @@ SET GLOBAL concurrent_insert = @concur_insert; # Cleanup DROP TABLE t1; ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/lock.test b/mysql-test/suite/storage_engine/lock.test index 2ee77ad93f3..ea612d4559b 100644 --- a/mysql-test/suite/storage_engine/lock.test +++ b/mysql-test/suite/storage_engine/lock.test @@ -9,9 +9,6 @@ # --source have_engine.inc -# Save the initial number of concurrent sessions. ---source include/count_sessions.inc - connect (con1,localhost,root,,); SET lock_wait_timeout=1; @@ -234,9 +231,5 @@ SELECT a,b FROM t1; UNLOCK TABLES; DROP TABLE t1, t2; -# Check that all connections opened by test cases in this file are really -# gone so execution of other tests won't be affected by their presence. ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/lock_concurrent.test b/mysql-test/suite/storage_engine/lock_concurrent.test index b75ccf0dd9f..c6d6cee93ac 100644 --- a/mysql-test/suite/storage_engine/lock_concurrent.test +++ b/mysql-test/suite/storage_engine/lock_concurrent.test @@ -6,8 +6,6 @@ --source have_engine.inc ---source include/count_sessions.inc - SET lock_wait_timeout = 1; --let $create_definition = a $int_col @@ -46,7 +44,5 @@ disconnect con1; connection default; DROP TABLE t1; ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/select_high_prio.test b/mysql-test/suite/storage_engine/select_high_prio.test index 4f1d1b39b99..f160973dad0 100644 --- a/mysql-test/suite/storage_engine/select_high_prio.test +++ b/mysql-test/suite/storage_engine/select_high_prio.test @@ -3,12 +3,6 @@ # --source have_engine.inc ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - # We will have 3 connections: # con1 will lock a table in READ mode # con0 will run UPDATE (and will wait on the lock) @@ -131,7 +125,5 @@ let $wait_timeout = 30; # Cleanup DROP TABLE t1; ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc b/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc index cbc1f06347f..8f985c6ab07 100644 --- a/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc +++ b/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc @@ -4,13 +4,6 @@ --source ../have_engine.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - connect (con1,localhost,root,,); connect (con2,localhost,root,,); @@ -43,6 +36,3 @@ connection default; disconnect con1; disconnect con2; DROP TABLE t1; - ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/suite/storage_engine/trx/select_for_update.test b/mysql-test/suite/storage_engine/trx/select_for_update.test index 0e5a3eeeab4..03f90f550c9 100644 --- a/mysql-test/suite/storage_engine/trx/select_for_update.test +++ b/mysql-test/suite/storage_engine/trx/select_for_update.test @@ -8,12 +8,6 @@ --source ../have_engine.inc --source support_transactions.inc ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - ---source include/count_sessions.inc - --source ../create_table.inc INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a'); @@ -80,6 +74,5 @@ SELECT a,b FROM t1; DROP TABLE t1; ---source include/wait_until_count_sessions.inc --source ../cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test b/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test index 92061036864..a160670bd79 100644 --- a/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test +++ b/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test @@ -8,12 +8,6 @@ --source ../have_engine.inc --source support_transactions.inc ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - ---source include/count_sessions.inc - --source ../create_table.inc INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a'); @@ -75,6 +69,5 @@ SELECT a,b FROM t1; DROP TABLE t1; ---source include/wait_until_count_sessions.inc --source ../cleanup_engine.inc diff --git a/mysql-test/suite/storage_engine/trx/transaction_isolation.inc b/mysql-test/suite/storage_engine/trx/transaction_isolation.inc index 3ff214bd30f..d01765ce361 100644 --- a/mysql-test/suite/storage_engine/trx/transaction_isolation.inc +++ b/mysql-test/suite/storage_engine/trx/transaction_isolation.inc @@ -10,13 +10,6 @@ --source ../have_engine.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - connect (con1,localhost,root,,); eval SET SESSION TRANSACTION ISOLATION LEVEL $trx_isolation; connect (con2,localhost,root,,); @@ -92,6 +85,3 @@ connection default; disconnect con1; disconnect con2; DROP TABLE t1; - ---source include/wait_until_count_sessions.inc - diff --git a/mysql-test/suite/storage_engine/trx/xa.test b/mysql-test/suite/storage_engine/trx/xa.test index 8dafa802125..7cda8bb627b 100644 --- a/mysql-test/suite/storage_engine/trx/xa.test +++ b/mysql-test/suite/storage_engine/trx/xa.test @@ -5,13 +5,6 @@ --source ../have_engine.inc --source support_xa.inc -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - --connect (con1,localhost,root,,) --connect (con2,localhost,root,,) diff --git a/mysql-test/suite/storage_engine/update_low_prio.test b/mysql-test/suite/storage_engine/update_low_prio.test index d6398b7dfec..99c8fe913b3 100644 --- a/mysql-test/suite/storage_engine/update_low_prio.test +++ b/mysql-test/suite/storage_engine/update_low_prio.test @@ -3,12 +3,6 @@ # --source have_engine.inc ---source include/count_sessions.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - --source create_table.inc INSERT INTO t1 (a,b) VALUES (11,'foobar'),(12,'b'); @@ -159,7 +153,5 @@ SELECT a,b FROM t1; # Cleanup DROP TABLE t1; ---source include/wait_until_count_sessions.inc - --source cleanup_engine.inc diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_func.result b/mysql-test/suite/sys_vars/r/debug_dbug_func.result index d0c002cf111..e252b013548 100644 --- a/mysql-test/suite/sys_vars/r/debug_dbug_func.result +++ b/mysql-test/suite/sys_vars/r/debug_dbug_func.result @@ -63,7 +63,6 @@ connect con1, localhost, root; SET GLOBAL debug_dbug= ''; connection default; SET SESSION debug_dbug= ''; -connection con1; disconnect con1; connection default; SET GLOBAL debug_dbug= ''; @@ -92,7 +91,6 @@ SET GLOBAL debug_dbug= ''; SET SESSION debug_dbug= ''; connection default; SET SESSION debug_dbug= ''; -connection con1; disconnect con1; connection default; # Test 5 - Different trace files 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 8291800afa3..c7082323429 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 @@ -1,4 +1,3 @@ -drop table if exists t1; '#--------------------FN_DYNVARS_063_01-------------------------#' SET @start_value= @@global.log_bin_trust_function_creators; ## Creating new user tt ## diff --git a/mysql-test/suite/sys_vars/t/debug_dbug_func.test b/mysql-test/suite/sys_vars/t/debug_dbug_func.test index a72636131ee..82336343791 100644 --- a/mysql-test/suite/sys_vars/t/debug_dbug_func.test +++ b/mysql-test/suite/sys_vars/t/debug_dbug_func.test @@ -77,9 +77,7 @@ SET GLOBAL debug_dbug= ''; connection default; SET SESSION debug_dbug= ''; -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc connection default; SET GLOBAL debug_dbug= ''; @@ -96,7 +94,6 @@ SET GLOBAL debug_dbug= ''; --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR SELECT @@global.debug_dbug, @@session.debug_dbug; disconnect con1; ---source include/wait_until_disconnected.inc --echo # Test 4 - Active session trace file on two connections connection default; @@ -111,9 +108,7 @@ SET SESSION debug_dbug= ''; connection default; SET SESSION debug_dbug= ''; -connection con1; disconnect con1; ---source include/wait_until_disconnected.inc connection default; --echo # Test 5 - Different trace files 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 958ae5d6c7a..b94ee6eabd0 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 @@ -22,11 +22,6 @@ source include/have_log_bin.inc; ---disable_warnings -drop table if exists t1; ---enable_warnings - - --echo '#--------------------FN_DYNVARS_063_01-------------------------#' ######################################################################## # Setting initial value of variable to 0 and verifying whether user diff --git a/mysql-test/suite/sys_vars/t/sysvars_star.test b/mysql-test/suite/sys_vars/t/sysvars_star.test index f1d1c137109..93720ccf34d 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_star.test +++ b/mysql-test/suite/sys_vars/t/sysvars_star.test @@ -39,5 +39,3 @@ drop user foo@localhost; set global low_priority_updates=default; disable_warnings; uninstall soname 'sql_errlog'; -let $count_sessions= 1; -source include/wait_until_count_sessions.inc; diff --git a/mysql-test/suite/versioning/t/not_embedded.test b/mysql-test/suite/versioning/t/not_embedded.test index 38f42a44587..3d8bf252ae1 100644 --- a/mysql-test/suite/versioning/t/not_embedded.test +++ b/mysql-test/suite/versioning/t/not_embedded.test @@ -39,9 +39,6 @@ set system_versioning_asof= DEFAULT; --echo # DELETE HISTORY and privileges --echo # -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - connect (root,localhost,root,,test); connection root;