bk commit into 5.1 tree (tomas:1.2544) BUG#21494

[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-04-03 14:49:57+02:00, tomas@stripped +2 -0
    Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave
data
    - insert gap event on cluster connect

  mysql-test/r/ndb_binlog_discover.result@stripped, 2007-04-03 14:49:54+02:00,
tomas@stripped +11 -6
      Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave
data
      - insert gap event on cluster connect

  mysql-test/t/ndb_binlog_discover.test@stripped, 2007-04-03 14:49:54+02:00,
tomas@stripped +3 -0
      Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave
data
      - insert gap event on cluster connect

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.4/mysql-test/r/ndb_binlog_discover.result	2006-12-20 15:34:37 +01:00
+++ 1.5/mysql-test/r/ndb_binlog_discover.result	2007-04-03 14:49:54 +02:00
@@ -3,10 +3,15 @@
 reset master;
 show binlog events from <binlog_start>;
 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.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
+master-bin.000001	#	Incident	#	#	#1 (LOST_EVENTS)
+master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
+PURGE MASTER LOGS TO 'master-bin.000002';
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000002	#	Query	#	#	BEGIN
+master-bin.000002	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000002	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
+master-bin.000002	#	Write_rows	#	#	table_id: #
+master-bin.000002	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000002	#	Query	#	#	COMMIT
 drop table t1;

--- 1.3/mysql-test/t/ndb_binlog_discover.test	2006-08-22 11:55:22 +02:00
+++ 1.4/mysql-test/t/ndb_binlog_discover.test	2007-04-03 14:49:54 +02:00
@@ -30,4 +30,7 @@
 --enable_query_log
 
 --source include/show_binlog_events.inc
+PURGE MASTER LOGS TO 'master-bin.000002';
+
+--source include/show_binlog_events.inc
 drop table t1;