From 44bac2ea9c353a26b11d8bf808543b5c7655049f Mon Sep 17 00:00:00 2001 From: Calvin Sun Date: Thu, 22 Apr 2010 14:16:14 -0500 Subject: [PATCH] mysql-5.1-innodb: add error codes to innodb_bug51920.test kill of active connection yields different error code depending on platform. --- mysql-test/suite/innodb/r/innodb_bug51920.result | 2 +- mysql-test/suite/innodb/t/innodb_bug51920.test | 6 +++++- mysql-test/suite/innodb_plugin/r/innodb_bug51920.result | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug51920.test | 6 +++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb_bug51920.result b/mysql-test/suite/innodb/r/innodb_bug51920.result index 4c2ec3e01e5..7ded141c239 100644 --- a/mysql-test/suite/innodb/r/innodb_bug51920.result +++ b/mysql-test/suite/innodb/r/innodb_bug51920.result @@ -9,5 +9,5 @@ SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO="UPDATE bug51920 SET i=2" INTO @thread_id; KILL @thread_id; -ERROR 70100: Query execution was interrupted +Got one of the listed errors DROP TABLE bug51920; diff --git a/mysql-test/suite/innodb/t/innodb_bug51920.test b/mysql-test/suite/innodb/t/innodb_bug51920.test index 05c884134be..bc3bb006c1c 100644 --- a/mysql-test/suite/innodb/t/innodb_bug51920.test +++ b/mysql-test/suite/innodb/t/innodb_bug51920.test @@ -31,8 +31,12 @@ let $wait_condition = SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id; -- source include/wait_condition.inc +# +# Bug#19723: kill of active connection yields different error code +# depending on platform. +# connection con1; --- error ER_QUERY_INTERRUPTED +-- error 1317, 2006, 2013 reap; connection default; DROP TABLE bug51920; diff --git a/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result b/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result index 4c2ec3e01e5..7ded141c239 100644 --- a/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result +++ b/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result @@ -9,5 +9,5 @@ SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO="UPDATE bug51920 SET i=2" INTO @thread_id; KILL @thread_id; -ERROR 70100: Query execution was interrupted +Got one of the listed errors DROP TABLE bug51920; diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test b/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test index b2e6b188959..7f34bad1aed 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test @@ -31,8 +31,12 @@ let $wait_condition = SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id; -- source include/wait_condition.inc +# +# Bug#19723: kill of active connection yields different error code +# depending on platform. +# connection con1; --- error ER_QUERY_INTERRUPTED +-- error 1317, 2006, 2013 reap; connection default; DROP TABLE bug51920;