Commit e01fd202 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
parents eb66350d 982e4559

mysql-test/r/wait_timeout.result

+2 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/t/wait_timeout.test

+4 −2
Original line number Diff line number Diff line
@@ -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;