Skip to content

Commit cf249ca

Browse files
committed
MDEV-37894 - main.show_check fails sporadically
Test output was affected by incompletely closed preceding connections. Wait for connections to leave I_S.PROCESSLIST before issuing SHOW PROCESSLIST.
1 parent 4654b4f commit cf249ca

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

mysql-test/main/show_check.test

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ drop table t1;
347347
--error ER_DBACCESS_DENIED_ERROR
348348
drop database mysqltest;
349349
disconnect con1;
350-
--source include/wait_until_disconnected.inc
351350

352351
connect (con2,localhost,mysqltest_2,,"*NO-ONE*");
353352
connection con2;
@@ -360,7 +359,6 @@ drop table mysqltest.t1;
360359
--error ER_DBACCESS_DENIED_ERROR
361360
drop database mysqltest;
362361
disconnect con2;
363-
--source include/wait_until_disconnected.inc
364362

365363
connect (con3,localhost,mysqltest_3,,"*NO-ONE*");
366364
connection con3;
@@ -370,7 +368,6 @@ show create database mysqltest;
370368
drop table mysqltest.t1;
371369
drop database mysqltest;
372370
disconnect con3;
373-
--source include/wait_until_disconnected.inc
374371

375372
connection default;
376373
set names binary;
@@ -1031,7 +1028,6 @@ connect (con4,localhost,mysqltest_4,,mysqltest);
10311028
connection con4;
10321029
show create database mysqltest;
10331030
disconnect con4;
1034-
--source include/wait_until_disconnected.inc
10351031
connection default;
10361032
delete from mysql.user where user='mysqltest_4';
10371033
delete from mysql.db where user='mysqltest_4';
@@ -1267,7 +1263,6 @@ SHOW ENGINE MYISAM STATUS;
12671263
--enable_result_log
12681264

12691265
disconnect conn1;
1270-
--source include/wait_until_disconnected.inc
12711266
connection default;
12721267
DROP USER test_u@localhost;
12731268

@@ -1291,7 +1286,6 @@ connection con1;
12911286
SHOW CREATE TABLE t1;
12921287

12931288
disconnect con1;
1294-
--source include/wait_until_disconnected.inc
12951289

12961290
connection default;
12971291
UNLOCK TABLES;
@@ -1363,7 +1357,6 @@ connection con1;
13631357
ALTER TABLE t1 CHARACTER SET = utf8;
13641358

13651359
disconnect con1;
1366-
--source include/wait_until_disconnected.inc
13671360

13681361
connection default;
13691362
COMMIT;
@@ -1375,6 +1368,9 @@ DROP TABLE t1;
13751368
--echo # Bug#57306 SHOW PROCESSLIST does not display string literals well.
13761369
--echo #
13771370

1371+
let $count_sessions= 1;
1372+
source include/wait_until_count_sessions.inc;
1373+
13781374
SET NAMES latin1;
13791375
SELECT GET_LOCK('t', 1000);
13801376
--connect (con1,localhost,root,,)
@@ -1397,7 +1393,6 @@ SELECT RELEASE_LOCK('t');
13971393
--connection con1
13981394
--reap
13991395
--disconnect con1
1400-
--source include/wait_until_disconnected.inc
14011396
--connection default
14021397
SET NAMES latin1;
14031398

0 commit comments

Comments
 (0)