From: Martin Skold
Date: November 1 2012 5:09pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (Martin.Skold:4058 to 4059)
List-Archive: http://lists.mysql.com/commits/145180
Message-Id: <20121101170924.039569F8259@quadfish>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4059 Martin Skold	2012-11-01 [merge]
      Merge from 7.1

    modified:
      mysql-test/include/wait_for_binlog_event.inc
 4058 Martin Skold	2012-11-01 [merge]
      Merge from 7.1

    modified:
      mysql-test/include/wait_for_binlog_event.inc
      mysql-test/suite/ndb_binlog/r/ndb_binlog_variants.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ndb_thd_ndb.h
=== modified file 'mysql-test/include/wait_for_binlog_event.inc'
--- a/mysql-test/include/wait_for_binlog_event.inc	2012-11-01 15:38:48 +0000
+++ b/mysql-test/include/wait_for_binlog_event.inc	2012-11-01 17:08:28 +0000
@@ -46,3 +46,4 @@ while (`SELECT INSTR("$_last_event","$wa
     }
   }
 }
+let $binlog_file=;

No bundle (reason: useless for push emails).