From: Martin Skold
Date: June 15 2012 9:15am
Subject: bzr push into mysql-5.1-telco-7.1 branch (Martin.Skold:4572 to 4573)
List-Archive: http://lists.mysql.com/commits/144242
Message-Id: <20120615091506.2AC4E9F8D7F@quadfish>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4573 Martin Skold	2012-06-15
      Removed initial restart of cluster in ndb_reconnect test since it reverts backup_id causing other test cases to fail, drop table internally in ndb instead

    modified:
      mysql-test/suite/ndb/t/ndb_reconnect.test
 4572 Martin Skold	2012-06-14
      Bug#13824846,Bug#14185126: Cleaning away stray files at server startup or at cluster reconnect (after restart): Regenerated test result since stray file is now always gone

    modified:
      mysql-test/suite/ndb/r/ndb_index_stat_restart.result
=== modified file 'mysql-test/suite/ndb/t/ndb_reconnect.test'
--- a/mysql-test/suite/ndb/t/ndb_reconnect.test	2012-06-14 11:48:36 +0000
+++ b/mysql-test/suite/ndb/t/ndb_reconnect.test	2012-06-15 09:14:25 +0000
@@ -99,8 +99,11 @@ CREATE TRIGGER trg2 BEFORE UPDATE ON t2 
 End //
 delimiter ;//
 
+# drop the ndb table inside ndb
+system 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 -i" >> $NDB_TOOLS_OUTPUT
+--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all restart" >> $NDB_TOOLS_OUTPUT
 # Wait for all nodes to enter "started"
 --exec $NDB_WAITER --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" >> $NDB_TOOLS_OUTPUT
 

No bundle (reason: useless for push emails).