1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
implicit command which isn't completed immediately.


mysql-test/r/status2.result:
  * Moved disconnect command to avoid race.
mysql-test/t/status2.test:
  * Moved disconnect command to avoid race.
This commit is contained in:
Kristofer Pettersson 2008-10-31 10:25:03 +01:00
parent 380f1a8440
commit 42659fb82d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/status2.result
View File

@ -53,11 +53,11 @@ Assert Questions == 16
SHOW STATUS LIKE 'Questions'; SHOW STATUS LIKE 'Questions';
Variable_name Value Variable_name Value
Questions 16 Questions 16
Global status updated; Assert diff == 5 Global status updated; Assert diff == 4
FLUSH STATUS; FLUSH STATUS;
SELECT 5; SELECT 4;
5 4
5 4
DROP TABLE t1,t2; DROP TABLE t1,t2;
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP FUNCTION f1; DROP FUNCTION f1;

4
mysql-test/t/status2.test
View File

@ -47,16 +47,16 @@ FLUSH STATUS;
let $org_questions= `SHOW GLOBAL STATUS LIKE 'questions'`; let $org_questions= `SHOW GLOBAL STATUS LIKE 'questions'`;
SELECT 1; SELECT 1;
connection default; connection default;
disconnect con1;
--echo Assert Questions == 16 --echo Assert Questions == 16
SHOW STATUS LIKE 'Questions'; SHOW STATUS LIKE 'Questions';
--echo Global status updated; Assert diff == 5 --echo Global status updated; Assert diff == 4
FLUSH STATUS; FLUSH STATUS;
let $new_questions= `SHOW GLOBAL STATUS LIKE 'questions'`; let $new_questions= `SHOW GLOBAL STATUS LIKE 'questions'`;
--disable_log --disable_log
let $diff= `SELECT SUBSTRING('$new_questions',10)-SUBSTRING('$org_questions',10)`; let $diff= `SELECT SUBSTRING('$new_questions',10)-SUBSTRING('$org_questions',10)`;
--enable_log --enable_log
eval SELECT $diff; eval SELECT $diff;
disconnect con1;
DROP TABLE t1,t2; DROP TABLE t1,t2;
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP FUNCTION f1; DROP FUNCTION f1;