3897 magnus.blaudd@stripped 2012-06-27 [merge]
Merge 7.2 -> 7.3
modified:
mysql-test/suite/ndb/t/ndb_reconnect.test
3896 magnus.blaudd@stripped 2012-06-27 [merge]
Merge 7.1 -> 7.3
modified:
sql/ha_ndbcluster_binlog.cc
=== modified file 'mysql-test/suite/ndb/t/ndb_reconnect.test'
--- a/mysql-test/suite/ndb/t/ndb_reconnect.test 2012-06-15 09:14:25 +0000
+++ b/mysql-test/suite/ndb/t/ndb_reconnect.test 2012-06-27 13:25:16 +0000
@@ -100,7 +100,7 @@ End //
delimiter ;//
# drop the ndb table inside ndb
-system exec $NDB_DROP_TABLE --no-defaults -d test t1 >> $NDB_TOOLS_OUTPUT ;
+--exec $NDB_DROP_TABLE --no-defaults -d test t1 >> $NDB_TOOLS_OUTPUT
# Restart cluster nodes and clear all meta-data
--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all restart" >> $NDB_TOOLS_OUTPUT
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.3 branch (magnus.blaudd:3896 to 3897) | magnus.blaudd | 27 Jun |