backport kill.test fix from 5.0

a50fafa4 · unknown · a97b8f6e · a50fafa4 · a50fafa4
Commit a50fafa4 authored Apr 11, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/kill.result mysql-test/r/kill.result +1 -1

mysql-test/t/kill.test mysql-test/t/kill.test +1 -1

No files found.
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -6,7 +6,7 @@ select ((@id := kill_id) - kill_id) from t1;
 0
 kill @id;
 select 1;
-ERROR HY000: MySQL server has gone away
+Got one of the listed errors
 select ((@id := kill_id) - kill_id) from t1;
 ((@id := kill_id) - kill_id)
 0

--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -27,7 +27,7 @@ connection con1;

 --disable_reconnect
 # this statement should fail
--error 2006
+--error 2006,2013
 select 1;
 --enable_reconnect
 # this should work, and we should have a new connection_id()