List:Commits« Previous MessageNext Message »
From:Matthias Leich Date:July 30 2009 3:13pm
Subject:bzr push into mysql-5.1-bugteam branch (Matthias.Leich:3049)
View as plain text  
 3049 Matthias Leich	2009-07-30 [merge]
      Merge latest changes into GCA tree, no conflicts

    modified:
      libmysqld/emb_qcache.h
      libmysqld/lib_sql.cc
      mysql-test/r/partition.result
      mysql-test/r/sp_notembedded.result
      mysql-test/t/partition.test
      mysql-test/t/sp_notembedded.test
      sql/protocol.cc
      sql/protocol.h
      sql/sp_head.cc
      sql/sql_yacc.yy
=== modified file 'mysql-test/t/innodb_notembedded.test'
--- a/mysql-test/t/innodb_notembedded.test	2008-07-10 16:09:39 +0000
+++ b/mysql-test/t/innodb_notembedded.test	2009-07-30 14:31:45 +0000
@@ -36,9 +36,15 @@ rollback;
 connection b;
 reap;
 rollback;
+
+# Cleanup
+connection a;
+disconnect a;
+--source include/wait_until_disconnected.inc
+connection b;
+disconnect b;
+--source include/wait_until_disconnected.inc
 connection default;
 drop table t1;
 drop function f1;
-disconnect a;
-disconnect b;
 SET @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;


Attachment: [text/bzr-bundle] bzr/matthias.leich@sun.com-20090730150108-1slw4itwyk4yto0z.bundle
Thread
bzr push into mysql-5.1-bugteam branch (Matthias.Leich:3049)Matthias Leich30 Jul