3741 magnus.blaudd@stripped 2011-12-20 [merge]
Merge 7.1 -> 7.2
modified:
mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test
3740 jonas oreland 2011-12-20 [merge]
ndb - merge 71 to 72
modified:
storage/ndb/test/ndbapi/testSystemRestart.cpp
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test 2011-12-19 17:39:26 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test 2011-12-20 12:36:35 +0000
@@ -1,5 +1,3 @@
-#let $rpl_debug=1; # Magnus
-
--source include/have_ndb.inc
--source include/ndb_have_online_alter.inc
--source suite/ndb_rpl/ndb_master-slave.inc
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3740 to 3741) | magnus.blaudd | 21 Dec |
