database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

branches/zip: Merge revisions 6918:6921 from branches/5.1:

Browse Source 
------------------------------------------------------------------------
  r6921 | mmakela | 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) | 2 lines
  Changed paths:
     M /branches/5.1/mysql-test/innodb_bug51920.result
     M /branches/5.1/mysql-test/innodb_bug51920.test

  branches/5.1: innodb_bug51920.test: Make the test quicker and more
  deterministic.  Suggested by Vasil Dimov.
  ------------------------------------------------------------------------
This commit is contained in:
mmakela
2010-03-31 10:54:30 +00:00
parent 6c682aff57
commit e92a36c804
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/innodb_bug51920.result
View File

@@ -9,10 +9,5 @@ SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE INFO="UPDATE bug51920 SET i=2" WHERE INFO="UPDATE bug51920 SET i=2"
INTO @thread_id; INTO @thread_id;
KILL @thread_id; KILL @thread_id;
SELECT sleep(2);
sleep(2)
0
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@thread_id;
ID USER HOST DB COMMAND TIME STATE INFO
ERROR 70100: Query execution was interrupted ERROR 70100: Query execution was interrupted
DROP TABLE bug51920; DROP TABLE bug51920;

5
mysql-test/innodb_bug51920.test
View File

@@ -22,8 +22,9 @@ WHERE INFO="UPDATE bug51920 SET i=2"
INTO @thread_id; INTO @thread_id;
KILL @thread_id; KILL @thread_id;
SELECT sleep(2); let $wait_condition =
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@thread_id; SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id;
-- source include/wait_condition.inc
connection con1; connection con1;
-- error ER_QUERY_INTERRUPTED -- error ER_QUERY_INTERRUPTED