diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:10:46 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:10:46 +0200 |
| commit | a3d3c852244421ab0de827b23e5b1d3747dc7feb (patch) | |
| tree | 8ac953eab07a69f570e6572a485347eb4c24fdbb /mysql-test | |
| parent | a04157fbb3f2b2e054c02968ffc82bb0eb971d58 (diff) | |
| parent | e2fbd70fb141b3c6c87f6134b0622c03c49345a4 (diff) | |
| download | mariadb-git-a3d3c852244421ab0de827b23e5b1d3747dc7feb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysql-test')
| -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; |