Test's result update because std_data/words.dat has been lengthened by 500 bytes.

Increased some tests' robustness a bit :
- Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests.
- Added save_master_pos to these tests to wait for the slave to start before purging its binary logs.

BitKeeper/etc/logging_ok

@@ -18,6 +18,7 @@ bk@admin.bk
 davida@isil.mysql.com
 gluh@gluh.(none)
 gluh@gluh.mysql.r18.ru
+guilhem@mysql.com
 gweir@work.mysql.com
 heikki@donna.mysql.fi
 heikki@hundin.mysql.fi

mysql-test/r/rpl_log.result

@@ -22,9 +22,9 @@ master-bin.000001	172	Intvar	1	172	INSERT_ID=1
 master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
 master-bin.000001	263	Query	1	263	use `test`; drop table t1
 master-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=81
-master-bin.000001	556	Exec_load	1	556	;file_id=1
-master-bin.000001	579	Query	1	579	use `test`; drop table t1
+master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
+master-bin.000001	1056	Exec_load	1	1056	;file_id=1
+master-bin.000001	1079	Query	1	1079	use `test`; drop table t1
 show binlog events from 79 limit 1;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000001	79	Query	1	79	use `test`; create table t1(n int not null auto_increment primary key)
@@ -50,10 +50,10 @@ master-bin.000001	172	Intvar	1	172	INSERT_ID=1
 master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
 master-bin.000001	263	Query	1	263	use `test`; drop table t1
 master-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=81
-master-bin.000001	556	Exec_load	1	556	;file_id=1
-master-bin.000001	579	Query	1	579	use `test`; drop table t1
-master-bin.000001	627	Rotate	1	627	master-bin.000002;pos=4
+master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
+master-bin.000001	1056	Exec_load	1	1056	;file_id=1
+master-bin.000001	1079	Query	1	1079	use `test`; drop table t1
+master-bin.000001	1127	Rotate	1	1127	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000002	4	Query	1	4	use `test`; create table t1 (n int)
@@ -76,10 +76,10 @@ slave-bin.000001	172	Intvar	1	172	INSERT_ID=1
 slave-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
 slave-bin.000001	263	Query	1	263	use `test`; drop table t1
 slave-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
-slave-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=81
-slave-bin.000001	565	Exec_load	1	556	;file_id=1
-slave-bin.000001	588	Query	1	579	use `test`; drop table t1
-slave-bin.000001	636	Rotate	2	636	slave-bin.000002;pos=4
+slave-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
+slave-bin.000001	1065	Exec_load	1	1056	;file_id=1
+slave-bin.000001	1088	Query	1	1079	use `test`; drop table t1
+slave-bin.000001	1136	Rotate	2	1136	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 slave-bin.000002	4	Query	1	4	use `test`; create table t1 (n int)
@@ -87,6 +87,6 @@ slave-bin.000002	62	Query	1	62	use `test`; insert into t1 values (1)
 slave-bin.000002	122	Query	1	122	use `test`; drop table t1
 show slave status;
 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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	MASTER_PORT	1	master-bin.000002	170	slave-relay-bin.000002	969	master-bin.000002	Yes	Yes			0		0	170	973
+127.0.0.1	root	MASTER_PORT	1	master-bin.000002	170	slave-relay-bin.000002	1469	master-bin.000002	Yes	Yes			0		0	170	1473
 show binlog events in 'slave-bin.000005' from 4;
 Error when executing command SHOW BINLOG EVENTS: Could not find target log

mysql-test/r/rpl_temporary.result

@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+reset master;
 drop table if exists t1,t2;
 create table t1(f int);
 create table t2(f int);

mysql-test/r/rpl_user_variables.result

@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+reset master;
 create table t1(n char(30));
 set @i1:=12345678901234, @i2:=-12345678901234, @i3:=0, @i4:=-1;
 set @s1:='This is a test', @r1:=12.5, @r2:=-12.5;

mysql-test/t/rpl_log.test

 source include/master-slave.inc;
 
-#clean up slave binlogs
+# Clean up old slave's binlogs.
+# The slave is started with --log-slave-updates
+# and this test does SHOW BINLOG EVENTS on the slave's
+# binlog. But previous tests can influence the current test's
+# binlog (e.g. a temporary table in the previous test has not
+# been explicitly deleted, and at the beginning of the current
+# test the slave immediately writes DROP TEMPORARY TABLE this_old_table).
+# We wait for the slave to have written all he wants to the binlog
+# (otherwise RESET MASTER may come too early).
+save_master_pos;
 connection slave;
+sync_with_master;
 stop slave;
 reset master;
 reset slave;

mysql-test/t/rpl_temporary.test

 source include/master-slave.inc;
 
+# Clean up old slave's binlogs.
+# The slave is started with --log-slave-updates
+# and this test does SHOW BINLOG EVENTS on the slave's
+# binlog. But previous tests can influence the current test's
+# binlog (e.g. a temporary table in the previous test has not
+# been explicitly deleted, or it has but the slave hasn't had
+# enough time to catch it before STOP SLAVE, 
+# and at the beginning of the current
+# test the slave immediately writes DROP TEMPORARY TABLE this_old_table).
+# We wait for the slave to have written all he wants to the binlog
+# (otherwise RESET MASTER may come too early).
+save_master_pos;
+connection slave;
+sync_with_master;
+reset master;
+connection master;
+
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
 

mysql-test/t/rpl_user_variables.test

@@ -3,6 +3,23 @@
 #
 source include/master-slave.inc;
 
+# Clean up old slave's binlogs.
+# The slave is started with --log-slave-updates
+# and this test does SHOW BINLOG EVENTS on the slave's
+# binlog. But previous tests can influence the current test's
+# binlog (e.g. a temporary table in the previous test has not
+# been explicitly deleted, or it has but the slave hasn't had
+# enough time to catch it before STOP SLAVE, 
+# and at the beginning of the current
+# test the slave immediately writes DROP TEMPORARY TABLE this_old_table).
+# We wait for the slave to have written all he wants to the binlog
+# (otherwise RESET MASTER may come too early).
+save_master_pos;
+connection slave;
+sync_with_master;
+reset master;
+connection master;
+
 create table t1(n char(30));
 set @i1:=12345678901234, @i2:=-12345678901234, @i3:=0, @i4:=-1;
 set @s1:='This is a test', @r1:=12.5, @r2:=-12.5;