manual merge of 28141

This commit is contained in:
Tatiana A. Nurnberg 2009-10-20 11:00:07 -07:00
commit 3f0d0d0633
7 changed files with 39 additions and 22 deletions

View file

@ -97,7 +97,7 @@ select ((@id := kill_id) - kill_id) from t3;
kill @id;
connection conn1;
-- error 1053,2013
-- error 1317,2013
reap;
connection default;