From e9cb57583e8875fc546b60ad23f68992e503859c Mon Sep 17 00:00:00 2001 From: Herman Lee Date: Thu, 21 Dec 2017 08:10:40 -0800 Subject: [PATCH] Force ddl_high_priority.test to set count_sessions=1 Summary: The ddl_high_priority test still fails with occassional flakiness. Force count_sessions to 1 and add an additional check to verify the number of processes returned by processlist is 1. Reviewed By: asandryh Differential Revision: D6619947 fbshipit-source-id: 13815d1 --- mysql-test/include/ddl_high_priority.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/ddl_high_priority.inc b/mysql-test/include/ddl_high_priority.inc index 22ca63b352fd..d365ad853625 100644 --- a/mysql-test/include/ddl_high_priority.inc +++ b/mysql-test/include/ddl_high_priority.inc @@ -73,7 +73,7 @@ drop table t1_new; ## no effect for regular users ## ---source include/count_sessions.inc +let $count_sessions = 1; connect (con2,localhost,test_user2,,test,,); # $con_kill is regular user --let $con_kill = con2 @@ -89,6 +89,10 @@ disconnect con2; # Ensure con2 is closed --source include/wait_until_count_sessions.inc +# Secondary check to ensure con2 is closed +let $wait_condition= + SELECT count(*) = 1 FROM information_schema.processlist; +--source include/wait_condition.inc # restore $con_kill --let $con_kill = default