database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

mysql-5.1-innodb: add error codes to innodb_bug51920.test

Browse Source 
kill of active connection yields different error code
depending on platform.
This commit is contained in:
Calvin Sun
2010-04-22 14:16:14 -05:00
parent e7c9998119
commit 44bac2ea9c
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/innodb_bug51920.result
View File

@ -9,5 +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;
ERROR 70100: Query execution was interrupted Got one of the listed errors
DROP TABLE bug51920; DROP TABLE bug51920;

6
mysql-test/suite/innodb/t/innodb_bug51920.test
View File

@ -31,8 +31,12 @@ let $wait_condition =
SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id; SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id;
-- source include/wait_condition.inc -- source include/wait_condition.inc
#
# Bug#19723: kill of active connection yields different error code
# depending on platform.
#
connection con1; connection con1;
-- error ER_QUERY_INTERRUPTED -- error 1317, 2006, 2013
reap; reap;
connection default; connection default;
DROP TABLE bug51920; DROP TABLE bug51920;

2
mysql-test/suite/innodb_plugin/r/innodb_bug51920.result
View File

@ -9,5 +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;
ERROR 70100: Query execution was interrupted Got one of the listed errors
DROP TABLE bug51920; DROP TABLE bug51920;

6
mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
View File

@ -31,8 +31,12 @@ let $wait_condition =
SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id; SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id;
-- source include/wait_condition.inc -- source include/wait_condition.inc
#
# Bug#19723: kill of active connection yields different error code
# depending on platform.
#
connection con1; connection con1;
-- error ER_QUERY_INTERRUPTED -- error 1317, 2006, 2013
reap; reap;
connection default; connection default;
DROP TABLE bug51920; DROP TABLE bug51920;