bk commit into 5.1 tree (msvensson:1.2487) BUG#6880

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-03-01 15:25:42+01:00, msvensson@stripped +5 -0
  Switch back to master before cleanup of the created tables
  That causes test case for bug#6880 to be run on the master
  instead of the slave and thus the result files need to be updated

  mysql-test/extra/rpl_tests/rpl_log.test@stripped, 2007-03-01 15:25:40+01:00, msvensson@stripped +4 -0
    Switch back to master before cleanup of the created tables
    That causes test case for bug#6880 to be run on the master
    instead of the slave and thus the result files need to be updated

  mysql-test/r/rpl_ndb_log.result@stripped, 2007-03-01 15:25:40+01:00, msvensson@stripped +3 -3
    Update result, test is now run on master

  mysql-test/r/rpl_row_log.result@stripped, 2007-03-01 15:25:40+01:00, msvensson@stripped +3 -3
    Update result, test is now run on master

  mysql-test/r/rpl_row_log_innodb.result@stripped, 2007-03-01 15:25:40+01:00, msvensson@stripped +3 -3
    Update result, test is now run on master

  mysql-test/r/rpl_stm_log.result@stripped, 2007-03-01 15:25:40+01:00, msvensson@stripped +4 -4
    Update result, test is now run on master

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint

--- 1.16/mysql-test/r/rpl_ndb_log.result	2006-12-01 15:48:23 +01:00
+++ 1.17/mysql-test/r/rpl_ndb_log.result	2007-03-01 15:25:40 +01:00
@@ -139,9 +139,9 @@ set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 select * from t1;
 a	b
 1	1

--- 1.12/mysql-test/r/rpl_row_log_innodb.result	2006-06-22 11:37:43 +02:00
+++ 1.13/mysql-test/r/rpl_row_log_innodb.result	2007-03-01 15:25:40 +01:00
@@ -115,9 +115,9 @@ set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 select * from t1;
 a	b
 1	1

--- 1.12/mysql-test/r/rpl_row_log.result	2006-06-22 11:37:43 +02:00
+++ 1.13/mysql-test/r/rpl_row_log.result	2007-03-01 15:25:40 +01:00
@@ -107,9 +107,9 @@ set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 select * from t1;
 a	b
 1	1

--- 1.73/mysql-test/r/rpl_stm_log.result	2006-10-23 09:58:55 +02:00
+++ 1.74/mysql-test/r/rpl_stm_log.result	2007-03-01 15:25:40 +01:00
@@ -105,10 +105,10 @@ set insert_id=5;
 insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Intvar	2	#	LAST_INSERT_ID=1
-slave-bin.000001	#	Intvar	2	#	INSERT_ID=5
-slave-bin.000001	#	Query	2	#	use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
+master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Intvar	1	#	LAST_INSERT_ID=1
+master-bin.000001	#	Intvar	1	#	INSERT_ID=5
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
 select * from t1;
 a	b
 1	1

--- 1.41/mysql-test/extra/rpl_tests/rpl_log.test	2006-10-23 09:58:55 +02:00
+++ 1.42/mysql-test/extra/rpl_tests/rpl_log.test	2007-03-01 15:25:40 +01:00
@@ -125,6 +125,8 @@ show slave status;
 --error 1220
 show binlog events in 'slave-bin.000005' from 4;
 
+connection master;
+
 # The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.
 
 DROP TABLE t1;
@@ -148,4 +150,6 @@ select * from t1;
 drop table t1;
 
 # End of 4.1 tests
+
+sync_with_master;