Commit 24086440 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
parents a525b294 26f7afaf

mysql-test/r/kill.result

+1 −1
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ select ((@id := kill_id) - kill_id) from t3; 
((@id := kill_id) - kill_id)

0

kill @id;

ERROR 08S01: Server shutdown in progress

Got one of the listed errors

drop table t1, t2, t3;

mysql-test/t/kill.test

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ select ((@id := kill_id) - kill_id) from t3; 
kill @id;



connection conn1;

-- error 1053

-- error 1053,2013

reap;



disconnect conn1;