Commit 5ef41db4 authored by Kristofer Pettersson's avatar Kristofer Pettersson
Browse files

Fixed race condition in test case status2. A 'disconnect' issues an 

implicit command which isn't completed immediately.
parent f3a4a186

mysql-test/r/status2.result

+4 −4
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ Assert Questions == 16 
SHOW STATUS LIKE 'Questions';

Variable_name	Value

Questions	16

Global status updated; Assert diff == 5

Global status updated; Assert diff == 4

FLUSH STATUS;

SELECT 5;

5

5

SELECT 4;

4

4

DROP TABLE t1,t2;

DROP PROCEDURE p1;

DROP FUNCTION f1;

mysql-test/t/status2.test

+2 −2
Original line number Diff line number Diff line
@@ -47,16 +47,16 @@ FLUSH STATUS; 
let $org_questions= `SHOW GLOBAL STATUS LIKE 'questions'`;

SELECT 1;

connection default;

disconnect con1;

--echo Assert Questions == 16

SHOW STATUS LIKE 'Questions';

--echo Global status updated; Assert diff == 5

--echo Global status updated; Assert diff == 4

FLUSH STATUS;

let $new_questions= `SHOW GLOBAL STATUS LIKE 'questions'`;

--disable_log

let $diff= `SELECT SUBSTRING('$new_questions',10)-SUBSTRING('$org_questions',10)`;

--enable_log

eval SELECT $diff;

disconnect con1;

DROP TABLE t1,t2;

DROP PROCEDURE p1;

DROP FUNCTION f1;