bk commit into 5.0 tree (jmiller:1.1981)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.0 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.1981 05/09/19 22:25:47 jmiller@stripped +3 -0
  More replication test cleanup

  mysql-test/r/rpl_stm_multi_query.result
    1.7 05/09/19 22:25:29 jmiller@stripped +8 -8
    Test had to change  due to code change on rbr where bin lon now has non deterministic
values in the info section

  mysql-test/r/rpl_row_multi_query.result
    1.2 05/09/19 22:25:28 jmiller@stripped +13 -13
    Test had to change  due to code change on rbr where bin lon now has non deterministic
values in the info section

  mysql-test/extra/rpl_tests/rpl_multi_query.test
    1.2 05/09/19 22:24:41 jmiller@stripped +1 -1
    Test had to change  due to code change on rbr where bin lon now has non deterministic
values in the info section

# 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/mysql-5.0-wl1012

--- 1.6/mysql-test/r/rpl_stm_multi_query.result	2005-08-13 14:05:56 +02:00
+++ 1.7/mysql-test/r/rpl_stm_multi_query.result	2005-09-19 22:25:29 +02:00
@@ -21,12 +21,12 @@
 5
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest
-master-bin.000001	#	Query	1	#	create database mysqltest
-master-bin.000001	#	Query	1	#	use `test`; create table mysqltest.t1 ( n int)
-master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(1)
-master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(2)
-master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(3)
-master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(4)
-master-bin.000001	#	Query	1	#	use `test`; insert into mysqltest.t1 values(5)
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
 drop database mysqltest;

--- 1.1/mysql-test/extra/rpl_tests/rpl_multi_query.test	2005-08-31 08:38:50 +02:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_multi_query.test	2005-09-19 22:24:41 +02:00
@@ -23,7 +23,7 @@
 sync_slave_with_master;
 select * from mysqltest.t1;
 connection master;
---replace_column 2 # 5 #
+--replace_column 2 # 5 # 6 #
 show binlog events from 102;
 drop database mysqltest;
 sync_slave_with_master;

--- 1.1/mysql-test/r/rpl_row_multi_query.result	2005-09-19 17:43:22 +02:00
+++ 1.2/mysql-test/r/rpl_row_multi_query.result	2005-09-19 22:25:28 +02:00
@@ -21,17 +21,17 @@
 5
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest
-master-bin.000001	#	Query	1	#	create database mysqltest
-master-bin.000001	#	Query	1	#	use `test`; create table mysqltest.t1 ( n int)
-master-bin.000001	#	Table_map	1	#	
-master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Table_map	1	#	
-master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Table_map	1	#	
-master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Table_map	1	#	
-master-bin.000001	#	Write_rows	1	#	
-master-bin.000001	#	Table_map	1	#	
-master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Table_map	1	#	#
+master-bin.000001	#	Write_rows	1	#	#
+master-bin.000001	#	Table_map	1	#	#
+master-bin.000001	#	Write_rows	1	#	#
+master-bin.000001	#	Table_map	1	#	#
+master-bin.000001	#	Write_rows	1	#	#
+master-bin.000001	#	Table_map	1	#	#
+master-bin.000001	#	Write_rows	1	#	#
+master-bin.000001	#	Table_map	1	#	#
+master-bin.000001	#	Write_rows	1	#	#
 drop database mysqltest;