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

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

    modified:
      mysql-test/include/wait_for_binlog_event.inc
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
 4059 Martin Skold	2012-11-01 [merge]
      Merge from 7.1

    modified:
      mysql-test/include/wait_for_binlog_event.inc
=== modified file 'mysql-test/include/wait_for_binlog_event.inc'
--- a/mysql-test/include/wait_for_binlog_event.inc	2012-11-01 17:08:28 +0000
+++ b/mysql-test/include/wait_for_binlog_event.inc	2012-11-01 19:19:39 +0000
@@ -7,7 +7,7 @@
 # USAGE
 #
 #    let $wait_binlog_event= DROP;
-#    [let $binlog_file= master-bin.000001;]
+#    [let $wait_binlog_file= master-bin.000001;]
 #    --source include/wait_for_binlog_event.inc
 
 let $_loop_count= 300;
@@ -23,27 +23,27 @@ while (`SELECT INSTR("$_last_event","$wa
     --die ERROR: failed while waiting for $wait_binlog_event in binlog 
   }
   real_sleep 0.1;
-  if (!$binlog_file)
+  if (!$wait_binlog_file)
   {
     let $_event= query_get_value(SHOW BINLOG EVENTS, Info, $_event_pos);
   }
-  if ($binlog_file)
+  if ($wait_binlog_file)
   {
-    let $_event= query_get_value(SHOW BINLOG EVENTS IN '$binlog_file', Info, $_event_pos);
+    let $_event= query_get_value(SHOW BINLOG EVENTS IN '$wait_binlog_file', Info, $_event_pos);
   }
   let $_last_event= $_event;
   while ($_event != "No such row")
   {
     inc $_event_pos;
     let $_last_event= $_event;
-    if (!$binlog_file)
+    if (!$wait_binlog_file)
     {
       let $_event= query_get_value(SHOW BINLOG EVENTS, Info, $_event_pos);
     }
-    if ($binlog_file)
+    if ($wait_binlog_file)
     {
-      let $_event= query_get_value(SHOW BINLOG EVENTS IN '$binlog_file', Info, $_event_pos);
+      let $_event= query_get_value(SHOW BINLOG EVENTS IN '$wait_binlog_file', Info, $_event_pos);
     }
   }
 }
-let $binlog_file=;
+let $wait_binlog_file=;

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2012-11-01 15:38:48 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2012-11-01 19:19:39 +0000
@@ -255,7 +255,7 @@ drop table stream_marker;
 
 # Wait until the UPDATE statement is confirmed to have made it into the current binary log
 --sleep 5
---let $binlog_file=mysqld-bin.000002
+--let $wait_binlog_file=mysqld-bin.000002
 --source include/wait_for_binlog_event.inc
 FLUSH LOGS;
 
@@ -270,7 +270,7 @@ drop table stream_marker;
 
 # Wait until the DELETE statement is confirmed to have made it into the current binary log
 --sleep 5
---let $binlog_file=mysqld-bin.000003
+--let $wait_binlog_file=mysqld-bin.000003
 --source include/wait_for_binlog_event.inc
 FLUSH LOGS;
 
@@ -307,7 +307,7 @@ drop table stream_marker;
 --enable_query_log
 
 # Wait until all statements are confirmed to have made it into the current binary log
---let $binlog_file=mysqld-bin.000001
+--let $wait_binlog_file=mysqld-bin.000001
 --source include/wait_for_binlog_event.inc
 FLUSH LOGS;
 
@@ -329,7 +329,7 @@ drop table stream_marker;
 --enable_query_log
 
 # Wait until all statements are confirmed to have made it into the current binary log
---let $binlog_file=mysqld-bin.000002
+--let $wait_binlog_file=mysqld-bin.000002
 --source include/wait_for_binlog_event.inc
 FLUSH LOGS;
 
@@ -345,7 +345,7 @@ drop table stream_marker;
 --enable_query_log
 
 # Wait until all statements are confirmed to have made it into the current binary log
---let $binlog_file=mysqld-bin.000003
+--let $wait_binlog_file=mysqld-bin.000003
 --source include/wait_for_binlog_event.inc
 FLUSH LOGS;
 

No bundle (reason: useless for push emails).