List:Internals« Previous MessageNext Message »
From:Mats Kindahl Date:March 14 2005 9:33am
Subject:bk commit into 5.1 tree (mats:1.1775)
View as plain text  
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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1775 05/03/14 10:33:49 mats@stripped +8 -0
  WL#1012: Fixing tests to handle the changed size of 
  Format_description_log_event.

  mysql-test/t/rpl_user_variables.test
    1.9 05/03/14 10:33:45 mats@stripped +1 -1
    Fixed test since binlog positions changed.

  mysql-test/t/rpl_until.test
    1.14 05/03/14 10:33:45 mats@stripped +7 -7
    Fixed test since binlog positions changed.

  mysql-test/t/rpl_log_pos.test
    1.32 05/03/14 10:33:45 mats@stripped +4 -4
    Fixed test since binlog positions changed.

  mysql-test/t/rpl_charset.test
    1.12 05/03/14 10:33:45 mats@stripped +2 -2
    Fixed test since binlog positions changed.

  mysql-test/r/rpl_user_variables.result
    1.11 05/03/14 10:33:45 mats@stripped +28 -28
    Fixed test since binlog positions changed.

  mysql-test/r/rpl_until.result
    1.18 05/03/14 10:33:45 mats@stripped +10 -10
    Fixed test since binlog positions changed.

  mysql-test/r/rpl_log_pos.result
    1.41 05/03/14 10:33:45 mats@stripped +10 -10
    Fixed test since binlog positions changed.

  mysql-test/r/rpl_charset.result
    1.12 05/03/14 10:33:45 mats@stripped +3 -3
    Fixed test since binlog positions changed.

# 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/w1012-mysql-5.1

--- 1.17/mysql-test/r/rpl_until.result	2005-03-10 20:10:06 +01:00
+++ 1.18/mysql-test/r/rpl_until.result	2005-03-14 10:33:45 +01:00
@@ -22,7 +22,7 @@
 master-bin.000001	493	Query	1	579	use `test`; insert into t2 values (1),(2)
 master-bin.000001	579	Query	1	665	use `test`; insert into t2 values (3),(4)
 master-bin.000001	665	Query	1	735	use `test`; drop table t2
-start slave until master_log_file='master-bin.000001', master_log_pos=304;
+start slave until master_log_file='master-bin.000001', master_log_pos=308;
 select * from t1;
 n
 1
@@ -31,8 +31,8 @@
 4
 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_MYPORT	1	master-bin.000001	735	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	308	#	Master	master-bin.000001	304	No						#
-start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	735	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	308	#	Master	master-bin.000001	308	No						#
+start slave until master_log_file='master-no-such-bin.000001', master_log_pos=295;
 select * from t1;
 n
 1
@@ -41,7 +41,7 @@
 4
 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_MYPORT	1	master-bin.000001	735	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	308	#	Master	master-no-such-bin.000001	291	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	735	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	308	#	Master	master-no-such-bin.000001	295	No						#
 start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=710;
 select * from t2;
 n
@@ -52,21 +52,21 @@
 #	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	735	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	579	#	Relay	slave-relay-bin.000004	710	No						#
 start slave;
 stop slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=710;
+start slave until master_log_file='master-bin.000001', master_log_pos=714;
 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_MYPORT	1	master-bin.000001	735	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	735	#	Master	master-bin.000001	710	No						#
-start slave until master_log_file='master-bin', master_log_pos=561;
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	735	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	735	#	Master	master-bin.000001	714	No						#
+start slave until master_log_file='master-bin', master_log_pos=565;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
+start slave until master_log_file='master-bin.000001', master_log_pos=565, relay_log_pos=16;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 start slave until master_log_file='master-bin.000001';
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 start slave until relay_log_file='slave-relay-bin.000002';
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=565;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 start slave sql_thread;
-start slave until master_log_file='master-bin.000001', master_log_pos=710;
+start slave until master_log_file='master-bin.000001', master_log_pos=714;
 Warnings:
 Note	1254	Slave is already running

--- 1.13/mysql-test/t/rpl_until.test	2004-12-06 01:05:21 +01:00
+++ 1.14/mysql-test/t/rpl_until.test	2005-03-14 10:33:45 +01:00
@@ -24,7 +24,7 @@
 
 # try to replicate all queries until drop of t1
 connection slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=304;
+start slave until master_log_file='master-bin.000001', master_log_pos=308;
 sleep 2;
 # here table should be still not deleted
 select * from t1;
@@ -33,7 +33,7 @@
 show slave status;
 
 # this should fail right after start
-start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
+start slave until master_log_file='master-no-such-bin.000001', master_log_pos=295;
 # again this table should be still not deleted
 select * from t1;
 sleep 2;
@@ -58,7 +58,7 @@
 stop slave;
 
 # this should stop immediately as we are already there
-start slave until master_log_file='master-bin.000001', master_log_pos=710;
+start slave until master_log_file='master-bin.000001', master_log_pos=714;
 # 2 is not enough when running with valgrind
 real_sleep 4
 # here the sql slave thread should be stopped
@@ -68,15 +68,15 @@
 
 #testing various error conditions
 --error 1277
-start slave until master_log_file='master-bin', master_log_pos=561;
+start slave until master_log_file='master-bin', master_log_pos=565;
 --error 1277
-start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
+start slave until master_log_file='master-bin.000001', master_log_pos=565, relay_log_pos=16;
 --error 1277
 start slave until master_log_file='master-bin.000001';
 --error 1277
 start slave until relay_log_file='slave-relay-bin.000002';
 --error 1277
-start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=565;
 
 start slave sql_thread;
-start slave until master_log_file='master-bin.000001', master_log_pos=710;
+start slave until master_log_file='master-bin.000001', master_log_pos=714;

--- 1.10/mysql-test/r/rpl_user_variables.result	2004-07-15 03:18:46 +02:00
+++ 1.11/mysql-test/r/rpl_user_variables.result	2005-03-14 10:33:45 +01:00
@@ -76,34 +76,34 @@
 NULL
 NULL
 NULL
-show binlog events from 179;
+show binlog events from 183;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	179	User var	2	222	@`i1`=12345678901234
-slave-bin.000001	222	User var	2	265	@`i2`=-12345678901234
-slave-bin.000001	265	User var	2	308	@`i3`=0
-slave-bin.000001	308	User var	2	351	@`i4`=-1
-slave-bin.000001	351	Query	1	456	use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
-slave-bin.000001	456	User var	2	499	@`r1`=12.5
-slave-bin.000001	499	User var	2	542	@`r2`=-12.5
-slave-bin.000001	542	Query	1	633	use `test`; insert into t1 values (@r1), (@r2)
-slave-bin.000001	633	User var	2	682	@`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci
-slave-bin.000001	682	User var	2	717	@`s2`=_latin1 "" COLLATE latin1_swedish_ci
-slave-bin.000001	717	User var	2	759	@`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
-slave-bin.000001	759	User var	2	801	@`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci
-slave-bin.000001	801	User var	2	843	@`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
-slave-bin.000001	843	Query	1	955	use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
-slave-bin.000001	955	User var	2	981	@`n1`=NULL
-slave-bin.000001	981	Query	1	1065	use `test`; insert into t1 values (@n1)
-slave-bin.000001	1065	User var	2	1091	@`n2`=NULL
-slave-bin.000001	1091	Query	1	1175	use `test`; insert into t1 values (@n2)
-slave-bin.000001	1175	Query	1	1285	use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
-slave-bin.000001	1285	User var	2	1327	@`a`=2
-slave-bin.000001	1327	Query	1	1421	use `test`; insert into t1 values (@a+(@b:=@a+1))
-slave-bin.000001	1421	User var	2	1458	@`q`=_latin1 0x616263 COLLATE latin1_swedish_ci
-slave-bin.000001	1458	Query	1	1584	use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
-slave-bin.000001	1584	User var	2	1626	@`a`=5
-slave-bin.000001	1626	Query	1	1714	use `test`; insert into t1 values (@a),(@a)
-slave-bin.000001	1714	User var	2	1739	@`a`=NULL
-slave-bin.000001	1739	Query	1	1834	use `test`; insert into t1 values (@a),(@a),(@a*5)
+slave-bin.000001	183	User var	2	226	@`i1`=12345678901234
+slave-bin.000001	226	User var	2	269	@`i2`=-12345678901234
+slave-bin.000001	269	User var	2	312	@`i3`=0
+slave-bin.000001	312	User var	2	355	@`i4`=-1
+slave-bin.000001	355	Query	1	460	use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
+slave-bin.000001	460	User var	2	503	@`r1`=12.5
+slave-bin.000001	503	User var	2	546	@`r2`=-12.5
+slave-bin.000001	546	Query	1	637	use `test`; insert into t1 values (@r1), (@r2)
+slave-bin.000001	637	User var	2	686	@`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci
+slave-bin.000001	686	User var	2	721	@`s2`=_latin1 "" COLLATE latin1_swedish_ci
+slave-bin.000001	721	User var	2	763	@`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001	763	User var	2	805	@`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci
+slave-bin.000001	805	User var	2	847	@`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001	847	Query	1	959	use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
+slave-bin.000001	959	User var	2	985	@`n1`=NULL
+slave-bin.000001	985	Query	1	1069	use `test`; insert into t1 values (@n1)
+slave-bin.000001	1069	User var	2	1095	@`n2`=NULL
+slave-bin.000001	1095	Query	1	1179	use `test`; insert into t1 values (@n2)
+slave-bin.000001	1179	Query	1	1289	use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
+slave-bin.000001	1289	User var	2	1331	@`a`=2
+slave-bin.000001	1331	Query	1	1425	use `test`; insert into t1 values (@a+(@b:=@a+1))
+slave-bin.000001	1425	User var	2	1462	@`q`=_latin1 0x616263 COLLATE latin1_swedish_ci
+slave-bin.000001	1462	Query	1	1588	use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
+slave-bin.000001	1588	User var	2	1630	@`a`=5
+slave-bin.000001	1630	Query	1	1718	use `test`; insert into t1 values (@a),(@a)
+slave-bin.000001	1718	User var	2	1743	@`a`=NULL
+slave-bin.000001	1743	Query	1	1838	use `test`; insert into t1 values (@a),(@a),(@a*5)
 drop table t1;
 stop slave;

--- 1.8/mysql-test/t/rpl_user_variables.test	2004-10-29 18:26:41 +02:00
+++ 1.9/mysql-test/t/rpl_user_variables.test	2005-03-14 10:33:45 +01:00
@@ -46,7 +46,7 @@
 connection slave;
 sync_with_master;
 select * from t1;
-show binlog events from 179;
+show binlog events from 183;
 connection master;
 drop table t1;
 save_master_pos;

--- 1.11/mysql-test/r/rpl_charset.result	2004-12-06 16:15:48 +01:00
+++ 1.12/mysql-test/r/rpl_charset.result	2005-03-14 10:33:45 +01:00
@@ -103,7 +103,7 @@
 1	cp850_general_ci
 drop database mysqltest2;
 drop database mysqltest3;
-show binlog events from 95;
+show binlog events from 99;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	drop database if exists mysqltest2
 master-bin.000001	#	Query	1	#	drop database if exists mysqltest3
@@ -200,8 +200,8 @@
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 stop slave;
 delete from t1;
-change master to master_log_pos=6809;
-start slave until master_log_file='master-bin.000001', master_log_pos=6967;
+change master to master_log_pos=6813;
+start slave until master_log_file='master-bin.000001', master_log_pos=6971;
 start slave;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)

--- 1.11/mysql-test/t/rpl_charset.test	2005-03-10 20:10:07 +01:00
+++ 1.12/mysql-test/t/rpl_charset.test	2005-03-14 10:33:45 +01:00
@@ -163,14 +163,14 @@
 # command just before the INSERT.
 # You can find it by doing:
 # ../client/mysqlbinlog var/log/master-bin.000001 | grep -3 CHARACTER_SET | tail -7
-change master to master_log_pos=6809;
+change master to master_log_pos=6813;
 
 # This position should be position of the INSERT command.
 # You can find it by doing:
 #
 # ../client/mysqlbinlog var/log/master-bin.000001 | grep -3 INSERT | tail -4
 
-start slave until master_log_file='master-bin.000001', master_log_pos=6967;
+start slave until master_log_file='master-bin.000001', master_log_pos=6971;
 
 # Slave is supposed to stop _after_ the INSERT, even though 'master_log_pos' is
 # the position of the beginning of the INSERT; after SET slave is not

--- 1.40/mysql-test/r/rpl_log_pos.result	2004-11-22 20:54:41 +01:00
+++ 1.41/mysql-test/r/rpl_log_pos.result	2005-03-14 10:33:45 +01:00
@@ -6,37 +6,37 @@
 start slave;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	95		
+master-bin.000001	99		
 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.000001	95	#	#	master-bin.000001	Yes	Yes							0		0	95	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	99	#	#	master-bin.000001	Yes	Yes							0		0	99	#	None		0	No						#
 stop slave;
-change master to master_log_pos=73;
+change master to master_log_pos=74;
 start slave;
 stop slave;
-change master to master_log_pos=73;
+change master to master_log_pos=74;
 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.000001	73	#	#	master-bin.000001	No	No							0		0	73	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	74	#	#	master-bin.000001	No	No							0		0	74	#	None		0	No						#
 start slave;
 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.000001	73	#	#	master-bin.000001	No	Yes							0		0	73	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	74	#	#	master-bin.000001	No	Yes							0		0	74	#	None		0	No						#
 stop slave;
-change master to master_log_pos=173;
+change master to master_log_pos=177;
 start slave;
 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.000001	173	#	#	master-bin.000001	No	Yes							0		0	173	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	177	#	#	master-bin.000001	No	Yes							0		0	177	#	None		0	No						#
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	95		
+master-bin.000001	99		
 create table if not exists t1 (n int);
 drop table if exists t1;
 create table t1 (n int);
 insert into t1 values (1),(2),(3);
 stop slave;
-change master to master_log_pos=95;
+change master to master_log_pos=99;
 start slave;
 select * from t1;
 n

--- 1.31/mysql-test/t/rpl_log_pos.test	2004-11-22 20:54:42 +01:00
+++ 1.32/mysql-test/t/rpl_log_pos.test	2005-03-14 10:33:45 +01:00
@@ -8,12 +8,12 @@
 --replace_column 1 # 8 # 9 # 23 # 33 #
 show slave status;
 stop slave;
-change master to master_log_pos=73;
+change master to master_log_pos=74;
 start slave;
 sleep 5;
 stop slave;
 
-change master to master_log_pos=73;
+change master to master_log_pos=74;
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 23 # 33 #
 show slave status;
@@ -23,7 +23,7 @@
 --replace_column 1 # 8 # 9 # 23 # 33 #
 show slave status;
 stop slave;
-change master to master_log_pos=173;
+change master to master_log_pos=177;
 start slave;
 sleep 2;
 --replace_result $MASTER_MYPORT MASTER_PORT
@@ -38,7 +38,7 @@
 save_master_pos;
 connection slave;
 stop slave;
-change master to master_log_pos=95;
+change master to master_log_pos=99;
 start slave;
 sync_with_master;
 select * from t1;
Thread
bk commit into 5.1 tree (mats:1.1775)Mats Kindahl14 Mar