Skip to content

Commit

Permalink
fix sporadic failures of main.lock_sync
Browse files Browse the repository at this point in the history
wait for all connections to disconnect before the cleanup
  • Loading branch information
vuvova committed May 2, 2024
1 parent dba9d19 commit 9dfef3f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 46 deletions.
22 changes: 0 additions & 22 deletions mysql-test/main/lock_sync.result
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,6 @@ ALWAYS
connect con1, localhost, root,,;
connect con2, localhost, root,,;
connection default;
drop table if exists t0, t1, t2, t3, t4, t5;
drop view if exists v1, v2;
drop procedure if exists p1;
drop procedure if exists p2;
drop procedure if exists p3;
drop function if exists f1;
drop function if exists f2;
drop function if exists f3;
drop function if exists f4;
drop function if exists f5;
drop function if exists f6;
drop function if exists f7;
drop function if exists f8;
drop function if exists f9;
drop function if exists f10;
drop function if exists f11;
drop function if exists f12;
drop function if exists f13;
drop function if exists f14;
drop function if exists f15;
drop function if exists f16;
drop function if exists f17;
create table t1 (i int primary key);
insert into t1 values (1), (2), (3), (4), (5);
create table t2 (j int primary key);
Expand Down
25 changes: 1 addition & 24 deletions mysql-test/main/lock_sync.test
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,6 @@ select @@global.concurrent_insert;
connect (con1, localhost, root,,);
connect (con2, localhost, root,,);
connection default;
--disable_warnings
drop table if exists t0, t1, t2, t3, t4, t5;
drop view if exists v1, v2;
drop procedure if exists p1;
drop procedure if exists p2;
drop procedure if exists p3;
drop function if exists f1;
drop function if exists f2;
drop function if exists f3;
drop function if exists f4;
drop function if exists f5;
drop function if exists f6;
drop function if exists f7;
drop function if exists f8;
drop function if exists f9;
drop function if exists f10;
drop function if exists f11;
drop function if exists f12;
drop function if exists f13;
drop function if exists f14;
drop function if exists f15;
drop function if exists f16;
drop function if exists f17;
--enable_warnings
create table t1 (i int primary key);
insert into t1 values (1), (2), (3), (4), (5);
create table t2 (j int primary key);
Expand Down Expand Up @@ -1218,6 +1194,7 @@ 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;
Expand Down

0 comments on commit 9dfef3f

Please sign in to comment.