bk commit into 5.1 tree (cmiller:1.2237)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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.2237 06/07/03 23:17:53 cmiller@zippy.(none) +2 -0
  Renumber events to make tests pass.  This must be a result of removing extraneous
  COMMITs -- the numbers collapse to fill the gaps.

  mysql-test/t/rpl_row_create_table.test
    1.6 06/07/03 23:17:47 cmiller@zippy.(none) +3 -3
    Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
    I don't fully understand this, but I can't see any harm to it.

  mysql-test/r/rpl_row_create_table.result
    1.6 06/07/03 23:17:47 cmiller@zippy.(none) +10 -10
    Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
    I don't fully understand this, but I can't see any harm to it.

# 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:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1

--- 1.5/mysql-test/r/rpl_row_create_table.result	2006-05-31 13:21:40 -04:00
+++ 1.6/mysql-test/r/rpl_row_create_table.result	2006-07-03 23:17:47 -04:00
@@ -137,11 +137,11 @@ a	b
 1	2
 2	4
 3	6
-SHOW BINLOG EVENTS FROM 1256;
+SHOW BINLOG EVENTS FROM 1118;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	1256	Query	1	1356	use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
-master-bin.000001	1356	Table_map	1	1396	table_id: # (test.t7)
-master-bin.000001	1396	Write_rows	1	1452	table_id: # flags: STMT_END_F
+master-bin.000001	1118	Query	1	1218	use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
+master-bin.000001	1218	Table_map	1	1258	table_id: # (test.t7)
+master-bin.000001	1258	Write_rows	1	1314	table_id: # flags: STMT_END_F
 SELECT * FROM t7 ORDER BY a,b;
 a	b
 1	2
@@ -154,10 +154,10 @@ INSERT INTO t7 SELECT a,b FROM tt4;
 ROLLBACK;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-SHOW BINLOG EVENTS FROM 1452;
+SHOW BINLOG EVENTS FROM 1314;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	1452	Table_map	1	1492	table_id: # (test.t7)
-master-bin.000001	1492	Write_rows	1	1548	table_id: # flags: STMT_END_F
+master-bin.000001	1314	Table_map	1	1354	table_id: # (test.t7)
+master-bin.000001	1354	Write_rows	1	1410	table_id: # flags: STMT_END_F
 SELECT * FROM t7 ORDER BY a,b;
 a	b
 1	2
@@ -191,10 +191,10 @@ Create Table	CREATE TABLE `t9` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SHOW BINLOG EVENTS FROM 1548;
+SHOW BINLOG EVENTS FROM 1410;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	1548	Query	1	1634	use `test`; CREATE TABLE t8 LIKE t4
-master-bin.000001	1634	Query	1	1773	use `test`; CREATE TABLE `t9` (
+master-bin.000001	1410	Query	1	1496	use `test`; CREATE TABLE t8 LIKE t4
+master-bin.000001	1496	Query	1	1635	use `test`; CREATE TABLE `t9` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 )

--- 1.5/mysql-test/t/rpl_row_create_table.test	2006-05-31 13:21:41 -04:00
+++ 1.6/mysql-test/t/rpl_row_create_table.test	2006-07-03 23:17:47 -04:00
@@ -76,7 +76,7 @@ INSERT INTO t7 SELECT a,b FROM tt3;
 SELECT * FROM t7 ORDER BY a,b;
 # Should be written to the binary log
 --replace_regex /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 1256;
+SHOW BINLOG EVENTS FROM 1118;
 sync_slave_with_master;
 SELECT * FROM t7 ORDER BY a,b;
 
@@ -87,7 +87,7 @@ BEGIN;
 INSERT INTO t7 SELECT a,b FROM tt4;
 ROLLBACK;
 --replace_regex /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 1452;
+SHOW BINLOG EVENTS FROM 1314;
 SELECT * FROM t7 ORDER BY a,b;
 sync_slave_with_master;
 SELECT * FROM t7 ORDER BY a,b;
@@ -101,7 +101,7 @@ CREATE TEMPORARY TABLE tt6 LIKE tt4;
 --query_vertical SHOW CREATE TABLE t8
 --query_vertical SHOW CREATE TABLE t9
 --replace_regex /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 1548;
+SHOW BINLOG EVENTS FROM 1410;
 sync_slave_with_master;
 --echo **** On Slave ****
 --query_vertical SHOW CREATE TABLE t8