diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-01-10 16:55:53 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-01-10 16:55:53 +0200 |
| commit | 982e455909c5e19e712f08b0baad89efc88f5f89 (patch) | |
| tree | 40605ce567a7c0342022d0a3c7291c087e11be96 | |
| parent | daaddeb656c26c685962fef69d19e7f264620e2b (diff) | |
| download | mariadb-git-982e455909c5e19e712f08b0baad89efc88f5f89.tar.gz | |
Added two possible error cases for a test.
mysql-test/r/wait_timeout.result:
Added two possible error cases for a test. Depending
on a platform, either errno can occur and is correct.
Possible errors are CR_SERVER_GONE_ERROR and
CR_SERVER_LOST
mysql-test/t/wait_timeout.test:
Added two possible error cases for a test. Depending
on a platform, either errno can occur and is correct.
Possible errors are CR_SERVER_GONE_ERROR and
CR_SERVER_LOST
| -rw-r--r-- | mysql-test/r/wait_timeout.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/wait_timeout.test | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/wait_timeout.result b/mysql-test/r/wait_timeout.result index b865a17454d..6fbff82f908 100644 --- a/mysql-test/r/wait_timeout.result +++ b/mysql-test/r/wait_timeout.result @@ -6,7 +6,7 @@ select 1; 1 1 select 2; -ERROR HY000: MySQL server has gone away +Got one of the listed errors select 3; 3 3 @@ -14,7 +14,7 @@ select 1; 1 1 select 2; -ERROR HY000: MySQL server has gone away +Got one of the listed errors select 3; 3 3 diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/t/wait_timeout.test index 67ed8fedfeb..9b9813f9655 100644 --- a/mysql-test/t/wait_timeout.test +++ b/mysql-test/t/wait_timeout.test @@ -46,7 +46,8 @@ while (!`select @aborted_clients`) 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; @@ -90,7 +91,8 @@ while (!`select @aborted_clients`) 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; |