bk commit into 5.1 tree (tomas:1.2573) BUG#31484

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-01 20:00:44+01:00, tomas@stripped +3 -0
  Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
  - correction

  mysql-test/suite/ndb/r/ndb_multi.result@stripped, 2007-11-01 20:00:41+01:00,
tomas@stripped +3 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

  mysql-test/suite/ndb/t/ndb_multi.test@stripped, 2007-11-01 20:00:41+01:00,
tomas@stripped +4 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-11-01 20:00:41+01:00,
tomas@stripped +1 -0
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

diff -Nrup a/mysql-test/suite/ndb/r/ndb_multi.result
b/mysql-test/suite/ndb/r/ndb_multi.result
--- a/mysql-test/suite/ndb/r/ndb_multi.result	2007-10-09 09:39:36 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_multi.result	2007-11-01 20:00:41 +01:00
@@ -1,4 +1,5 @@
 drop table if exists t1, t2, t3, t4;
+flush status;
 drop table if exists t1, t2, t3, t4;
 flush status;
 create table t1 (a int) engine=ndbcluster;
@@ -132,11 +133,11 @@ master_epoch, count))
 engine ndb;
 show tables like '%$%';
 Tables_in_test (%$%)
-t1$EX
+t1$ex
 use test;
 show tables like '%$%';
 Tables_in_test (%$%)
-t1$EX
+t1$ex
 drop table `test`.`t1$EX`;
 show tables like '%$%';
 Tables_in_test (%$%)
diff -Nrup a/mysql-test/suite/ndb/t/ndb_multi.test b/mysql-test/suite/ndb/t/ndb_multi.test
--- a/mysql-test/suite/ndb/t/ndb_multi.test	2007-10-09 09:39:36 +02:00
+++ b/mysql-test/suite/ndb/t/ndb_multi.test	2007-11-01 20:00:41 +01:00
@@ -4,11 +4,11 @@
 --disable_warnings
 connection server2;
 drop table if exists t1, t2, t3, t4;
+flush status;
 connection server1;
 drop table if exists t1, t2, t3, t4;
---enable_warnings
-
 flush status;
+--enable_warnings
 
 # Create test tables on server1
 create table t1 (a int) engine=ndbcluster;
@@ -139,9 +139,11 @@ create table `test`.`t1$EX`
 
 # check that table shows up ok on both servers
 # before bugfix table would not show up on server2
+--replace_regex /EX/ex/
 show tables like '%$%';
 connection server2;
 use test;
+--replace_regex /EX/ex/
 show tables like '%$%';
 
 # check cleanup
diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-11-01 15:07:57 +01:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-11-01 20:00:41 +01:00
@@ -3716,6 +3716,7 @@ restart:
   /*
     Main NDB Injector loop
   */
+  if (ndb_binlog_running)
   {
     /*
       Always insert a GAP event as we cannot know what has happened