summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-01-26 16:55:40 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-01-26 16:55:40 +0100
commit7b3469862c7f486bab41012767e2666614e47569 (patch)
treecee1d91f40557b157eff3f1f5f4c0aaeeeb53cda /mysql-test/suite/sys_vars
parent66a64adb3e97cb13bdbedb24168e231840f14c55 (diff)
downloadmariadb-git-7b3469862c7f486bab41012767e2666614e47569.tar.gz
Fix a few failing tests on win2008r2-vs2010-amd64-debug
Diffstat (limited to 'mysql-test/suite/sys_vars')
-rw-r--r--mysql-test/suite/sys_vars/t/completion_type_func.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/t/completion_type_func.test b/mysql-test/suite/sys_vars/t/completion_type_func.test
index 9495a8e118c..6b1aa6a29cd 100644
--- a/mysql-test/suite/sys_vars/t/completion_type_func.test
+++ b/mysql-test/suite/sys_vars/t/completion_type_func.test
@@ -156,7 +156,7 @@ COMMIT;
--echo ## Inserting rows should give error here because connection should ##
--echo ## disconnect after using COMMIT ##
---Error 2006,2013,ER_QUERY_INTERRUPTED
+--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED
INSERT INTO t1 VALUES(4,'Record_4');
--echo switch to connection test_con2
@@ -171,7 +171,7 @@ INSERT INTO t1 VALUES(12,'Record_12');
ROLLBACK;
--echo ## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ##
---Error 2006,2013,ER_QUERY_INTERRUPTED
+--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED
INSERT INTO t1 VALUES(4,'Record_4');
connection default;