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

@ -93,7 +93,7 @@ kill @id;
# We don't drop t3 as this is a temporary table
drop table t2;
connection master;
--error 1053,2013
--error 1317,2013
reap;
connection slave;
# The SQL slave thread should now have stopped because the query was killed on