bk commit into 5.1 tree (mats:1.1806)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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.1806 05/04/18 11:31:04 mats@stripped +3 -0
  WL#2325: Fixed failing row-level test.

  mysql-test/t/rpl_row_basic.test
    1.5 05/04/18 11:30:54 mats@stripped +6 -6
    Binlog position changed.

  mysql-test/r/rpl_row_basic.result
    1.5 05/04/18 11:30:54 mats@stripped +11 -11
    Binlog position changed.

  BitKeeper/deleted/.del-rpl_row_basic.disabled~2ccef3789b8c29ad
    1.2 05/04/18 11:28:13 mats@stripped +0 -0
    Delete: mysql-test/t/rpl_row_basic.disabled

# 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:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/w2325-mysql-5.1

--- 1.4/mysql-test/r/rpl_row_basic.result	2005-04-01 13:32:22 +02:00
+++ 1.5/mysql-test/r/rpl_row_basic.result	2005-04-18 11:30:54 +02:00
@@ -15,12 +15,12 @@
 C1	C2
 INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
 INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A');
-SHOW BINLOG EVENTS FROM 218;
+SHOW BINLOG EVENTS FROM 217;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<binlog>	<pos>	Table_map	1	<end_log_pos>	
-<binlog>	<pos>	Write_rows	1	<end_log_pos>	
-<binlog>	<pos>	Table_map	1	<end_log_pos>	
-<binlog>	<pos>	Write_rows	1	<end_log_pos>	
+<binlog>	217	Table_map	1	<end_log_pos>	
+<binlog>	253	Write_rows	1	<end_log_pos>	
+<binlog>	295	Table_map	1	<end_log_pos>	
+<binlog>	331	Write_rows	1	<end_log_pos>	
 SELECT * FROM t1;
 C1	C2
 A	B
@@ -38,10 +38,10 @@
 X	Z
 A	A
 DELETE FROM t1 WHERE C1 = C2;
-SHOW BINLOG EVENTS FROM 374;
+SHOW BINLOG EVENTS FROM 373;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<binlog>	<pos>	Table_map	1	<end_log_pos>	
-<binlog>	<pos>	Delete_rows	1	<end_log_pos>	
+<binlog>	373	Table_map	1	<end_log_pos>	
+<binlog>	409	Delete_rows	1	<end_log_pos>	
 SELECT * FROM t1;
 C1	C2
 A	B
@@ -55,10 +55,10 @@
 A	C
 X	Z
 UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
-SHOW BINLOG EVENTS FROM 447;
+SHOW BINLOG EVENTS FROM 446;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<binlog>	<pos>	Table_map	1	<end_log_pos>	
-<binlog>	<pos>	Update_rows	1	<end_log_pos>	
+<binlog>	446	Table_map	1	<end_log_pos>	
+<binlog>	482	Update_rows	1	<end_log_pos>	
 SELECT * FROM t1;
 C1	C2
 A	B

--- 1.4/mysql-test/t/rpl_row_basic.test	2005-04-01 13:40:13 +02:00
+++ 1.5/mysql-test/t/rpl_row_basic.test	2005-04-18 11:30:54 +02:00
@@ -15,8 +15,8 @@
 connection master;
 INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
 INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A');
---replace_column 1 <binlog> 2 <pos> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 218;
+--replace_column 1 <binlog> 5 <end_log_pos>
+SHOW BINLOG EVENTS FROM 217;
 SELECT * FROM t1;
 sync_slave_with_master;
 SELECT * FROM t1;
@@ -26,8 +26,8 @@
 # should be deleted.
 connection master;
 DELETE FROM t1 WHERE C1 = C2;
---replace_column 1 <binlog> 2 <pos> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 374;
+--replace_column 1 <binlog> 5 <end_log_pos>
+SHOW BINLOG EVENTS FROM 373;
 SELECT * FROM t1;
 sync_slave_with_master;
 SELECT * FROM t1;
@@ -39,8 +39,8 @@
 #
 connection master;
 UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
---replace_column 1 <binlog> 2 <pos> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 447;
+--replace_column 1 <binlog> 5 <end_log_pos>
+SHOW BINLOG EVENTS FROM 446;
 SELECT * FROM t1;
 sync_slave_with_master;
 SELECT * FROM t1;