From: magnus.blaudd
Date: June 27 2012 1:37pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4582 to 4583) WL#6224
List-Archive: http://lists.mysql.com/commits/144326
Message-Id: <20120627133732.29847.1957.4583@peek02.se.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4583 magnus.blaudd@stripped	2012-06-27
      WL#6224 Adapt MySQL Cluster to 5.6
       - mysqltest's builtin command "system" is deprecated in the future,
         use "exec" to run our tool ndb_drop_table 

    modified:
      mysql-test/suite/ndb/t/ndb_reconnect.test
 4582 magnus.blaudd@stripped	2012-06-27
      WL#6224 Adapt MySQL Cluster to 5.6
       - use memset() in favor of bzero in ha_ndbcluster

    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).