Commit 371f8c69 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/t/kill.test:
  Auto merged
parents 1bbf3a27 00ed42a3

mysql-test/t/kill.test

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ select ((@id := kill_id) - kill_id) from t1; 
kill @id;



connection con1;

--sleep 1



# this statement should fail

--error 2006,2013