From 46b1ee73307c1ef44da8bb206aaf88552a828a2e Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Tue, 4 May 2010 12:40:41 +0300 Subject: [PATCH] Merge from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3415 revision-id: calvin.sun@oracle.com-20100422191614-2atswbilyyxep6rm parent: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn committer: Calvin Sun branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-22 14:16:14 -0500 message: mysql-5.1-innodb: add error codes to innodb_bug51920.test kill of active connection yields different error code depending on platform. modified: mysql-test/suite/innodb/r/innodb_bug51920.result 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.result mysql-test/suite/innodb/t/innodb_bug51920.test 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.test mysql-test/suite/innodb_plugin/r/innodb_bug51920.result 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.result mysql-test/suite/innodb_plugin/t/innodb_bug51920.test 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.test ------------------------------------------------------------ --- mysql-test/suite/innodb/r/innodb_bug51920.result | 2 +- mysql-test/suite/innodb/t/innodb_bug51920.test | 6 +++++- 2 files changed, 6 insertions(+), 2 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;