summaryrefslogtreecommitdiff
path: root/mysql-test/t/wait_timeout.test
diff options
context:
space:
mode:
authorsvoj@june.mysql.com <>2007-02-05 15:31:20 +0400
committersvoj@june.mysql.com <>2007-02-05 15:31:20 +0400
commit4a6770e06eddaf8595da3d414764c90502382f88 (patch)
tree82da2e999c2a32e262b0e683aee6c5f89c9d2789 /mysql-test/t/wait_timeout.test
parentdde4f421f1f73daa917d5bb7eda8df4b32d97b19 (diff)
parenta602d4a56ec50ca7e7bb9e0c6415145e9de80d44 (diff)
downloadmariadb-git-4a6770e06eddaf8595da3d414764c90502382f88.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
Diffstat (limited to 'mysql-test/t/wait_timeout.test')
-rw-r--r--mysql-test/t/wait_timeout.test6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/t/wait_timeout.test
index bdff72cdc76..826a35cabdf 100644
--- a/mysql-test/t/wait_timeout.test
+++ b/mysql-test/t/wait_timeout.test
@@ -49,7 +49,8 @@ sleep 1;
connection default;
# When the connection is closed in this way, the error code should
# be consistent see bug#2845 for an explanation
---error 2006
+# depending on platform/client, either errno 2006 or 2013 can occur below
+--error 2006,2013
select 2;
--enable_reconnect
select 3;
@@ -96,7 +97,8 @@ sleep 1;
connection con1;
# When the connection is closed in this way, the error code should
# be consistent see bug#2845 for an explanation
---error 2006
+# depending on platform/client, either errno 2006 or 2013 can occur below
+--error 2006,2013
select 2;
--enable_reconnect
select 3;