From: Date: February 16 2006 9:50pm
Subject: bk commit into 5.1 tree (jmiller:1.2123)
List-Archive: http://lists.mysql.com/commits/2751
Message-Id: <200602162050.k1GKoDRh019945@ndb08.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2123 06/02/16 21:50:05 jmiller@stripped +5 -0
  Test cleanup

  mysql-test/r/rpl_ndb_log.result
    1.4 06/02/16 21:49:47 jmiller@stripped +17 -32
    Updated results

  mysql-test/r/rpl_row_log_innodb.result
    1.3 06/02/16 21:49:36 jmiller@stripped +17 -24
    Updated results

  mysql-test/r/rpl_row_log.result
    1.4 06/02/16 21:49:36 jmiller@stripped +17 -24
    Updated results

  mysql-test/extra/rpl_tests/rpl_log.test
    1.31 06/02/16 21:48:56 jmiller@stripped +9 -6
    Updated and moved drop of tables to end of test to help bin log be more deterministic

  mysql-test/t/disabled.def
    1.74 06/02/16 21:47:41 jmiller@stripped +33 -33
    Updated

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.3/mysql-test/r/rpl_ndb_log.result	2006-02-08 17:46:58 +01:00
+++ 1.4/mysql-test/r/rpl_ndb_log.result	2006-02-16 21:49:47 +01:00
@@ -16,7 +16,6 @@
 select count(*) from t1;
 count(*)
 69
-drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
@@ -35,7 +34,6 @@
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Query	1	#	COMMIT
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
 show binlog events from 102 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
@@ -47,14 +45,12 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Table_map	1	#	cluster_replication.apply_status
 flush logs;
-create table t5 (a int)ENGINE=NDB;
-drop table t5;
+create table t3 (a int)ENGINE=NDB;
 start slave;
 flush logs;
 stop slave;
-create table t1 (n int)ENGINE=NDB;
-insert into t1 values (1);
-drop table t1;
+create table t2 (n int)ENGINE=NDB;
+insert into t2 values (1);
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
@@ -73,34 +69,27 @@
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Query	1	#	COMMIT
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000002	#	Query	1	#	use `test`; create table t5 (a int)ENGINE=NDB
-master-bin.000002	#	Query	1	#	BEGIN
-master-bin.000002	#	Table_map	1	#	cluster_replication.apply_status
-master-bin.000002	#	Write_rows	1	#	
-master-bin.000002	#	Query	1	#	COMMIT
-master-bin.000002	#	Query	1	#	use `test`; drop table t5
-master-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)ENGINE=NDB
+master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB
+master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB
 master-bin.000002	#	Query	1	#	BEGIN
 master-bin.000002	#	Table_map	1	#	cluster_replication.apply_status
 master-bin.000002	#	Write_rows	1	#	
-master-bin.000002	#	Table_map	1	#	test.t1
+master-bin.000002	#	Table_map	1	#	test.t2
 master-bin.000002	#	Write_rows	1	#	
 master-bin.000002	#	Query	1	#	COMMIT
-master-bin.000002	#	Query	1	#	use `test`; drop table t1
 show binary logs;
 Log_name	File_size
-master-bin.000001	1798
-master-bin.000002	991
+master-bin.000001	1722
+master-bin.000002	603
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	2205
-slave-bin.000002	583
+slave-bin.000001	1817
+slave-bin.000002	198
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -113,33 +102,29 @@
 slave-bin.000001	#	Query	2	#	COMMIT
 slave-bin.000001	#	Query	1	#	use `test`; drop table t1
 slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB
+slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB
 slave-bin.000001	#	Query	2	#	BEGIN
 slave-bin.000001	#	Table_map	2	#	cluster_replication.apply_status
 slave-bin.000001	#	Write_rows	2	#	
 slave-bin.000001	#	Table_map	2	#	test.t1
 slave-bin.000001	#	Write_rows	2	#	
 slave-bin.000001	#	Query	2	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
-slave-bin.000001	#	Query	1	#	use `test`; create table t5 (a int)ENGINE=NDB
-slave-bin.000001	#	Query	2	#	BEGIN
-slave-bin.000001	#	Table_map	2	#	cluster_replication.apply_status
-slave-bin.000001	#	Write_rows	2	#	
-slave-bin.000001	#	Query	2	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; drop table t5
 slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)ENGINE=NDB
+slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB
 slave-bin.000002	#	Query	2	#	BEGIN
 slave-bin.000002	#	Table_map	2	#	cluster_replication.apply_status
 slave-bin.000002	#	Write_rows	2	#	
-slave-bin.000002	#	Table_map	2	#	test.t1
+slave-bin.000002	#	Table_map	2	#	test.t2
 slave-bin.000002	#	Write_rows	2	#	
 slave-bin.000002	#	Query	2	#	COMMIT
-slave-bin.000002	#	Query	1	#	use `test`; drop table t1
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	991	#	#	master-bin.000002	Yes	Yes				#			0		0	991	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	603	#	#	master-bin.000002	Yes	Yes				#			0		0	603	#	None		0	No						#
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;

--- 1.2/mysql-test/r/rpl_row_log_innodb.result	2006-02-08 17:47:10 +01:00
+++ 1.3/mysql-test/r/rpl_row_log_innodb.result	2006-02-16 21:49:36 +01:00
@@ -16,7 +16,6 @@
 select count(*) from t1;
 count(*)
 69
-drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
@@ -29,7 +28,6 @@
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Xid	1	#	COMMIT /* XID */
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
 show binlog events from 102 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
@@ -41,14 +39,12 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Write_rows	1	#	
 flush logs;
-create table t5 (a int)ENGINE=InnoDB;
-drop table t5;
+create table t3 (a int)ENGINE=InnoDB;
 start slave;
 flush logs;
 stop slave;
-create table t1 (n int)ENGINE=InnoDB;
-insert into t1 values (1);
-drop table t1;
+create table t2 (n int)ENGINE=InnoDB;
+insert into t2 values (1);
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
@@ -61,27 +57,24 @@
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
 master-bin.000001	#	Xid	1	#	COMMIT /* XID */
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000002	#	Query	1	#	use `test`; create table t5 (a int)ENGINE=InnoDB
-master-bin.000002	#	Query	1	#	use `test`; drop table t5
-master-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)ENGINE=InnoDB
-master-bin.000002	#	Table_map	1	#	test.t1
+master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=InnoDB
+master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=InnoDB
+master-bin.000002	#	Table_map	1	#	test.t2
 master-bin.000002	#	Write_rows	1	#	
 master-bin.000002	#	Xid	1	#	COMMIT /* XID */
-master-bin.000002	#	Query	1	#	use `test`; drop table t1
 show binary logs;
 Log_name	File_size
-master-bin.000001	1386
-master-bin.000002	552
+master-bin.000001	1310
+master-bin.000002	400
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1560
-slave-bin.000002	377
+slave-bin.000001	1408
+slave-bin.000002	301
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -94,20 +87,20 @@
 slave-bin.000001	#	Table_map	1	#	test.t1
 slave-bin.000001	#	Write_rows	1	#	
 slave-bin.000001	#	Xid	1	#	COMMIT /* XID */
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
-slave-bin.000001	#	Query	1	#	use `test`; create table t5 (a int)ENGINE=InnoDB
-slave-bin.000001	#	Query	1	#	use `test`; drop table t5
+slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=InnoDB
 slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)ENGINE=InnoDB
-slave-bin.000002	#	Table_map	1	#	test.t1
+slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=InnoDB
+slave-bin.000002	#	Table_map	1	#	test.t2
 slave-bin.000002	#	Write_rows	1	#	
 slave-bin.000002	#	Xid	1	#	COMMIT /* XID */
-slave-bin.000002	#	Query	1	#	use `test`; drop table t1
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	552	#	#	master-bin.000002	Yes	Yes				#			0		0	552	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	400	#	#	master-bin.000002	Yes	Yes				#			0		0	400	#	None		0	No						#
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;

--- 1.73/mysql-test/t/disabled.def	2006-02-16 21:42:36 +01:00
+++ 1.74/mysql-test/t/disabled.def	2006-02-16 21:47:41 +01:00
@@ -9,37 +9,37 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-events               : Test case instability - infinite locking. To be fixed.
-func_group           : Bug#15448
-func_math            : Bug#15448
-group_min_max        : Bug#15448 
-#ndb_alter_table_row : sometimes wrong error 1015!=1046
-ndb_autodiscover     : Needs to be fixed w.r.t binlog
-ndb_autodiscover2    : Needs to be fixed w.r.t binlog
-ndb_binlog_basic     : Results are not deterministic, Tomas will fix
-ndb_binlog_ddl_multi : Bug#17038 [PATCH PENDING]
-ndb_dd_backuprestore : Bug#17045 NdbDictionaryImpl::fix_blob_events causes core 
-ndb_gis              : garbled msgs from corrupt THD*
-partition_03ndb      : Bug#16385
-ps_7ndb              : dbug assert in RBR mode when executing test suite
-rpl_bit_npk          : Bug#13418
-rpl_ddl              : Bug#15963 SBR does not show "Definer" correctly
-rpl_ndb_auto_inc     : Bug#17086
-rpl_ndb_basic        : Bug#16228 [IN REVIEW]
-rpl_ndb_charset      : Bug#17246
-rpl_ndb_ddl          : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_insert_ignore : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
-rpl_ndb_relay_space  : Bug#16993
-rpl_ndb_sp007        : Bug #17290
-rpl_sp               : Bug#16456
-rpl_until            : Unstable test case, bug#15886
-sp-goto              : GOTO is currently is disabled - will be fixed in the future
-subselect            : Bug#15706 (ps mode) [PATCH PENDING]
-rpl_ndb_log          : result not deterministic
 binlog_row_insert_select : Bug #17385
-rpl_row_basic_2myisam : Bug #17385
-rpl_row_basic_3innodb : Bug #17385
-rpl_row_create_table : Bug #17385
-ndb_load        : Bug#17233
+events                  : Test case instability - infinite locking. To be fixed.
+func_group              : Bug#15448
+func_math               : Bug#15448
+group_min_max           : Bug#15448 
+#ndb_alter_table_row    : sometimes wrong error 1015!=1046
+ndb_autodiscover        : Needs to be fixed w.r.t binlog
+ndb_autodiscover2       : Needs to be fixed w.r.t binlog
+ndb_binlog_basic        : Results are not deterministic, Tomas will fix
+ndb_binlog_ddl_multi    : Bug#17038 [PATCH PENDING]
+ndb_dd_backuprestore    : Bug#17045 NdbDictionaryImpl::fix_blob_events causes core 
+ndb_gis                 : garbled msgs from corrupt THD*
+ndb_load                : Bug#17233
+partition_03ndb         : Bug#16385
+ps_7ndb                 : dbug assert in RBR mode when executing test suite
+rpl_bit_npk             : Bug#13418
+rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
+rpl_ndb_auto_inc        : Bug#17086
+rpl_ndb_basic           : Bug#16228 [IN REVIEW]
+rpl_ndb_charset         : Bug#17246
+rpl_ndb_ddl             : Bug#17400: delete & update of rows in table without pk fails
+rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
+rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
+#rpl_ndb_log            : result not deterministic
+rpl_ndb_relay_space     : Bug#16993
+rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails
+rpl_ndb_sp007           : Bug #17290
+rpl_row_create_table    : Bug #17385
+rpl_row_basic_2myisam   : Bug #17385
+rpl_row_basic_3innodb   : Bug #17385
+rpl_sp                  : Bug#16456
+rpl_until               : Unstable test case, bug#15886
+sp-goto                 : GOTO is currently is disabled - will be fixed in the future
+subselect               : Bug#15706 (ps mode) [PATCH PENDING]

--- 1.3/mysql-test/r/rpl_row_log.result	2006-02-08 16:52:26 +01:00
+++ 1.4/mysql-test/r/rpl_row_log.result	2006-02-16 21:49:36 +01:00
@@ -16,7 +16,6 @@
 select count(*) from t1;
 count(*)
 69
-drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
@@ -27,7 +26,6 @@
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
 show binlog events from 102 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
@@ -39,14 +37,12 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Write_rows	1	#	
 flush logs;
-create table t5 (a int)ENGINE=MyISAM;
-drop table t5;
+create table t3 (a int)ENGINE=MyISAM;
 start slave;
 flush logs;
 stop slave;
-create table t1 (n int)ENGINE=MyISAM;
-insert into t1 values (1);
-drop table t1;
+create table t2 (n int)ENGINE=MyISAM;
+insert into t2 values (1);
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
@@ -57,26 +53,23 @@
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
 master-bin.000001	#	Table_map	1	#	test.t1
 master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000002	#	Query	1	#	use `test`; create table t5 (a int)ENGINE=MyISAM
-master-bin.000002	#	Query	1	#	use `test`; drop table t5
-master-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)ENGINE=MyISAM
-master-bin.000002	#	Table_map	1	#	test.t1
+master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=MyISAM
+master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=MyISAM
+master-bin.000002	#	Table_map	1	#	test.t2
 master-bin.000002	#	Write_rows	1	#	
-master-bin.000002	#	Query	1	#	use `test`; drop table t1
 show binary logs;
 Log_name	File_size
-master-bin.000001	1332
-master-bin.000002	525
+master-bin.000001	1256
+master-bin.000002	373
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1506
-slave-bin.000002	350
+slave-bin.000001	1354
+slave-bin.000002	274
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -87,19 +80,19 @@
 slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
 slave-bin.000001	#	Table_map	1	#	test.t1
 slave-bin.000001	#	Write_rows	1	#	
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
-slave-bin.000001	#	Query	1	#	use `test`; create table t5 (a int)ENGINE=MyISAM
-slave-bin.000001	#	Query	1	#	use `test`; drop table t5
+slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=MyISAM
 slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	#	Query	1	#	use `test`; create table t1 (n int)ENGINE=MyISAM
-slave-bin.000002	#	Table_map	1	#	test.t1
+slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=MyISAM
+slave-bin.000002	#	Table_map	1	#	test.t2
 slave-bin.000002	#	Write_rows	1	#	
-slave-bin.000002	#	Query	1	#	use `test`; drop table t1
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	525	#	#	master-bin.000002	Yes	Yes				#			0		0	525	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	373	#	#	master-bin.000002	Yes	Yes				#			0		0	373	#	None		0	No						#
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;

--- 1.30/mysql-test/extra/rpl_tests/rpl_log.test	2006-02-08 16:52:26 +01:00
+++ 1.31/mysql-test/extra/rpl_tests/rpl_log.test	2006-02-16 21:48:56 +01:00
@@ -36,7 +36,6 @@
 eval create table t1 (word char(20) not null)ENGINE=$engine_type;
 load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
 select count(*) from t1;
-drop table t1;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\//
@@ -68,8 +67,7 @@
 # To make it predictable, we do a useless update now, but which has the
 # interest of making the slave catch both rotate events.
 
-eval create table t5 (a int)ENGINE=$engine_type;
-drop table t5;
+eval create table t3 (a int)ENGINE=$engine_type;
 
 # Sync slave and force it to start on another binary log
 
@@ -86,9 +84,8 @@
 
 # Create some entries for second log
 
-eval create table t1 (n int)ENGINE=$engine_type;
-insert into t1 values (1);
-drop table t1;
+eval create table t2 (n int)ENGINE=$engine_type;
+insert into t2 values (1);
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\//
@@ -125,3 +122,9 @@
 
 --error 1220
 show binlog events in 'slave-bin.000005' from 4;
+
+# The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;