mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from SVN

Browse source
This commit is contained in:
Vasil Dimov 2010-03-31 16:13:15 +03:00
commit 67a61ef663
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subdir/mysql-test/innodb_bug51920.result
View file

@ -9,10 +9,5 @@ SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE INFO="UPDATE bug51920 SET i=2"
INTO @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
DROP TABLE bug51920;

5
subdir/mysql-test/innodb_bug51920.test
View file

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