Commit 444f8869 authored by unknown's avatar unknown
Browse files

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

into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
parents 5b9cdaa4 acdf7189

mysql-test/r/kill.result

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 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;

select get_lock("a", 10);

get_lock("a", 10)

mysql-test/t/kill.test

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



connection conn1;

-- error 1053

-- error 1053,2013

reap;



connection default;