bk commit into 5.1 tree (tomas:1.2361) BUG#14516

[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.2361 06/04/24 23:29:33 tomas@stripped +2 -0
  Bug #14516 Restart of cluster can cause NDB API replication failure
  - this behavior was already changed, adding testcase

  mysql-test/t/ndb_binlog_discover.test
    1.1 06/04/24 23:29:25 tomas@stripped +19 -0
    New BitKeeper file ``mysql-test/t/ndb_binlog_discover.test''

  mysql-test/r/ndb_binlog_discover.result
    1.1 06/04/24 23:29:25 tomas@stripped +13 -0
    New BitKeeper file ``mysql-test/r/ndb_binlog_discover.result''

  mysql-test/t/ndb_binlog_discover.test
    1.0 06/04/24 23:29:25 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/t/ndb_binlog_discover.test

  mysql-test/r/ndb_binlog_discover.result
    1.0 06/04/24 23:29:25 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/r/ndb_binlog_discover.result

# 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.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new
--- New file ---
+++ mysql-test/r/ndb_binlog_discover.result	06/04/24 23:29:25
drop table if exists t1;
create table t1 (a int key) engine=ndb;
reset master;
insert into t1 values(1);
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: # (cluster.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
drop table t1;

--- New file ---
+++ mysql-test/t/ndb_binlog_discover.test	06/04/24 23:29:25
-- source include/have_ndb.inc
-- source include/have_binlog_format_row.inc

--disable_warnings
drop table if exists t1;
--enable_warnings

#
# Bug #14516 Restart of cluster can cause NDB API replication failure
#
create table t1 (a int key) engine=ndb;
reset master;
--exec $NDB_MGM --no-defaults -e "all restart -n" > /dev/null
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started > /dev/null
--exec $NDB_MGM --no-defaults -e "all start" > /dev/null
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
insert into t1 values(1);
--source include/show_binlog_events.inc
drop table t1;