bk commit into 5.1 tree (tomas:1.2372) BUG#21806

[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
  1.2372 06/12/20 15:34:45 tomas@poseidon. +3 -0
  Bug #21806: wrong ndb binlog behaviour when cluster disconnects/restarts
  - latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved

  sql/ha_ndbcluster_binlog.cc
    1.92 06/12/20 15:34:37 tomas@poseidon. +1 -1
    Bug #21806: wrong ndb binlog behaviour when cluster disconnects/restarts
    - latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved

  mysql-test/t/disabled.def
    1.222 06/12/20 15:34:37 tomas@poseidon. +2 -2
    Bug #21806: wrong ndb binlog behaviour when cluster disconnects/restarts
    - latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved

  mysql-test/r/ndb_binlog_discover.result
    1.4 06/12/20 15:34:37 tomas@poseidon. +1 -1
    Bug #21806: wrong ndb binlog behaviour when cluster disconnects/restarts
    - latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.221/mysql-test/t/disabled.def	2006-12-08 22:18:55 +01:00
+++ 1.222/mysql-test/t/disabled.def	2006-12-20 15:34:37 +01:00
@@ -32,8 +32,8 @@
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
-ndb_binlog_discover      : bug#21806 2006-08-24
-ndb_autodiscover3        : bug#21806
+#ndb_binlog_discover      : bug#21806 2006-08-24
+#ndb_autodiscover3        : bug#21806
 
 flush2                   : Bug#24805 Pushbuild can't handle test with --disable-log-bin
 

--- 1.3/mysql-test/r/ndb_binlog_discover.result	2006-11-21 21:32:49 +01:00
+++ 1.4/mysql-test/r/ndb_binlog_discover.result	2006-12-20 15:34:37 +01:00
@@ -5,7 +5,7 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Table_map	#	#	table_id: # (mysql.apply_status)
+master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
 master-bin.000001	#	Write_rows	#	#	table_id: #
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT

--- 1.91/sql/ha_ndbcluster_binlog.cc	2006-12-13 21:04:07 +01:00
+++ 1.92/sql/ha_ndbcluster_binlog.cc	2006-12-20 15:34:37 +01:00
@@ -3542,7 +3542,7 @@
       if (abort_loop)
         goto err;
       schema_res= s_ndb->pollEvents(100, &schema_gci);
-    } while (ndb_latest_received_binlog_epoch == schema_gci);
+    } while (schema_gci == 0 || ndb_latest_received_binlog_epoch == schema_gci);
     if (ndb_binlog_running)
     {
       Uint64 gci= i_ndb->getLatestGCI();