database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

mariadb-test: wait on disconnect

Browse Source 
Remove one of the major sources of race condiitons in mariadb-test.
Normally, mariadb_close() sends COM_QUIT to the server and immediately
disconnects. In mariadb-test it means the test can switch to another
connection and sends queries to the server before the server even
started parsing the COM_QUIT packet and these queries can see the
connection as fully active, as it didn't reach dispatch_command yet.

This is a major source of instability in tests and many - but not all,
still less than a half - tests employ workarounds. The correct one
is a pair count_sessions.inc/wait_until_count_sessions.inc.
Also very popular was wait_until_disconnected.inc, which was completely
useless, because it verifies that the connection is closed, and after
disconnect it always is, it didn't verify whether the server processed
COM_QUIT. Sadly the placebo was as widely used as the real thing.

Let's fix this by making mariadb-test `disconnect` command _to wait_ for
the server to confirm. This makes almost all workarounds redundant.

In some cases count_sessions.inc/wait_until_count_sessions.inc is still
needed, though, as only `disconnect` command is changed:

 * after external tools, like `exec $MYSQL`
 * after failed `connect` command
 * replication, after `STOP SLAVE`
 * Federated/CONNECT/SPIDER/etc after `DROP TABLE`

and also in some XA tests, because an XA transaction is dissociated from
the THD very late, after the server has closed the client connection.

Collateral cleanups: fix comments, remove some redundant statements:
 * DROP IF EXISTS if nothing is known to exist
 * DROP table/view before DROP DATABASE
 * REVOKE privileges before DROP USER
 etc
This commit is contained in:
Sergei Golubchik
2025-06-12 00:43:26 +02:00
committed by Dmitry Shulga
parent 18985d8471
commit bead24b7f3
347 changed files with 131 additions and 2015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/innodb/r/innodb_bug30113362.result
View File

@@ -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;

2
mysql-test/suite/innodb/r/innodb_notembedded.result
View File

@@ -24,9 +24,7 @@ connection a;
rollback;
connection b;
rollback;
connection a;
disconnect a;
connection b;
disconnect b;
connection default;
drop table t1;

2
mysql-test/suite/innodb/t/auto_increment_lock_mode.test
View File

@@ -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

3
mysql-test/suite/innodb/t/avoid_deadlock_with_blocked.test
View File

@@ -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

2
mysql-test/suite/innodb/t/blob_cmp_empty.test
View File

@@ -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

3
mysql-test/suite/innodb/t/change_column_collation.test
View File

@@ -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

3
mysql-test/suite/innodb/t/create_select.test
View File

@@ -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

4
mysql-test/suite/innodb/t/cursor-restore-locking.test
View File

@@ -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

3
mysql-test/suite/innodb/t/cursor-restore-unique-null.test
View File

@@ -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

2
mysql-test/suite/innodb/t/deadlock_detect.test
View File

@@ -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

2
mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test
View File

@@ -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

3
mysql-test/suite/innodb/t/deadlock_on_lock_upgrade.test
View File

@@ -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

2
mysql-test/suite/innodb/t/deadlock_victim_race.test
View File

@@ -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

2
mysql-test/suite/innodb/t/deadlock_wait_lock_race.test
View File

@@ -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

2
mysql-test/suite/innodb/t/deadlock_wait_thr_race.test
View File

@@ -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

1
mysql-test/suite/innodb/t/foreign_key.test
View File

@@ -1,5 +1,4 @@
--source include/have_innodb.inc
--source include/count_sessions.inc
--source include/default_charset.inc
--disable_query_log

2
mysql-test/suite/innodb/t/implicit_gap_lock_convertion.test
View File

@@ -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

5
mysql-test/suite/innodb/t/innodb-alter-debug.test
View File

@@ -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

7
mysql-test/suite/innodb/t/innodb-alter-nullable.test
View File

@@ -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

2
mysql-test/suite/innodb/t/innodb-index-debug.test
View File

@@ -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

7
mysql-test/suite/innodb/t/innodb-index-online-delete.test
View File

@@ -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

7
mysql-test/suite/innodb/t/innodb-index-online-purge.test
View File

@@ -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

7
mysql-test/suite/innodb/t/innodb-index-online.test
View File

@@ -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;

3
mysql-test/suite/innodb/t/innodb-read-view.test
View File

@@ -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

7
mysql-test/suite/innodb/t/innodb-table-online.test
View File

@@ -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;

9
mysql-test/suite/innodb/t/innodb-timeout.test
View File

@@ -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 <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 <initial_timeout>
@@ -196,5 +189,3 @@ disconnect con2;
# clear
connection default;
DROP TABLE t1;
--source include/wait_until_count_sessions.inc

2
mysql-test/suite/innodb/t/innodb_bug14676111.test
View File

@@ -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

9
mysql-test/suite/innodb/t/innodb_bug30113362.test
View File

@@ -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

6
mysql-test/suite/innodb/t/innodb_bug42419.test
View File

@@ -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");

4
mysql-test/suite/innodb/t/innodb_i_s_innodb_locks.test
View File

@@ -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;

4
mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test
View File

@@ -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;

4
mysql-test/suite/innodb/t/innodb_information_schema.test
View File

@@ -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

1
mysql-test/suite/innodb/t/innodb_mysql.test
View File

@@ -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;

4
mysql-test/suite/innodb/t/innodb_notembedded.test
View File

@@ -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;

3
mysql-test/suite/innodb/t/innodb_row_lock_time_ms.test
View File

@@ -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

2
mysql-test/suite/innodb/t/insert-before-delete.test
View File

@@ -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

2
mysql-test/suite/innodb/t/lock_delete_updated.test
View File

@@ -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

4
mysql-test/suite/innodb/t/lock_deleted.test
View File

@@ -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

2
mysql-test/suite/innodb/t/lock_isolation.test
View File

@@ -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

2
mysql-test/suite/innodb/t/lock_move_wait_lock_race.test
View File

@@ -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

3
mysql-test/suite/innodb/t/lock_update_split_rc.test
View File

@@ -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

1
mysql-test/suite/innodb/t/mdev-14846.test
View File

@@ -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

2
mysql-test/suite/innodb/t/mon_lock_wait_current_count.test
View File

@@ -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

4
mysql-test/suite/innodb/t/page_reorganize.test
View File

@@ -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

2
mysql-test/suite/innodb/t/purge_pessimistic.test
View File

@@ -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;

3
mysql-test/suite/innodb/t/stats_persistent.test
View File

@@ -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

3
mysql-test/suite/innodb/t/tmpdir.test
View File

@@ -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

3
mysql-test/suite/innodb/t/trigger.test
View File

@@ -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

3
mysql-test/suite/innodb/t/trx_sys_t_find_lf_hash_error.test
View File

@@ -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

6
mysql-test/suite/innodb/t/update-cascade.test
View File

@@ -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

2
mysql-test/suite/innodb/t/xa_prepare_reset_supremum_lock.test
View File

@@ -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

2
mysql-test/suite/innodb/t/xa_prepare_unlock_unmodified.test
View File

@@ -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

3
mysql-test/suite/innodb/t/xa_unlock_unmodified.test
View File

@@ -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