Here comes a nasty patch, although I am not ready to push it yet. I will

first pull, merge,test, and get it to work.

The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to 
prepare for multi-master implementation. 

I also documented IO_CACHE quite extensively and to some extend, THD class.


Makefile.am:
  moved tags target script into a separate file
include/my_sys.h:
  fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
  updated replication locks, but now I see I did it wrong and it won't compile. Will fix
  before the push.
mysql-test/r/rpl000014.result:
  test result update
mysql-test/r/rpl000015.result:
  test result update
mysql-test/r/rpl000016.result:
  test result update
mysql-test/r/rpl_log.result:
  test result update
mysql-test/t/rpl000016-slave.sh:
  remove relay logs
mysql-test/t/rpl000017-slave.sh:
  remove relay logs
mysql-test/t/rpl_log.test:
  updated test
mysys/mf_iocache.c:
  IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
  IO_CACHE update to make replication work
mysys/thr_mutex.c:
  cosmetic change
sql/item_func.cc:
  new replication code
sql/lex.h:
  new replication
sql/log.cc:
  new replication
sql/log_event.cc:
  new replication
sql/log_event.h:
  new replication
sql/mini_client.cc:
  new replication
sql/mini_client.h:
  new replication
sql/mysql_priv.h:
  new replication
sql/mysqld.cc:
  new replication
sql/repl_failsafe.cc:
  new replication
sql/slave.cc:
  new replication
sql/slave.h:
  new replication
sql/sql_class.cc:
  new replication
sql/sql_class.h:
  new replication
sql/sql_lex.h:
  new replication
sql/sql_parse.cc:
  new replication
sql/sql_repl.cc:
  new replication
sql/sql_repl.h:
  new replication
sql/sql_show.cc:
  new replication
sql/sql_yacc.yy:
  new replication
sql/stacktrace.c:
  more robust stack tracing
sql/structs.h:
  new replication code
BitKeeper/etc/ignore:
  Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list

9 files changed, 96 insertions, 85 deletions

diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result
index e5130792d78..a0646b9c39f 100644
--- a/mysql-test/r/rpl000014.result
+++ b/mysql-test/r/rpl000014.result
@@ -7,22 +7,22 @@ show master status;
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	79		
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	79	Yes			0		0	1
+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
+127.0.0.1	root	9306	1	master-bin.001	79	mysql-relay-bin.002	120	master-bin.001	Yes	Yes			0		0	79
 change master to master_log_pos=73;
 slave stop;
 change master to master_log_pos=73;
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	73	No			0		0	1
+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
+127.0.0.1	root	9306	1	master-bin.001	73	mysql-relay-bin.001	4	master-bin.001	No	No			0		0	73
 slave start;
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	73	Yes			0		0	1
+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
+127.0.0.1	root	9306	1	master-bin.001	73	mysql-relay-bin.001	4	master-bin.001	Yes	Yes			0		0	73
 change master to master_log_pos=173;
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	173	Yes			0		0	1
+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
+127.0.0.1	root	9306	1	master-bin.001	173	mysql-relay-bin.001	4	master-bin.001	Yes	Yes			0		0	173
 show master status;
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	79		
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index e3bde4a5abd..571c4c0b1e3 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -4,21 +4,21 @@ File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	79		
 reset slave;
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-		0	0		0	No			0		0	0
+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
+		0	0		0		0		No	No			0		0	0
 change master to master_host='127.0.0.1';
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	test	3306	60		4	No			0		0	0
+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
+127.0.0.1	test	3306	60		4	mysql-relay-bin.001	4		No	No			0		0	0
 change master to master_host='127.0.0.1',master_user='root',
 master_password='',master_port=9306;
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60		4	No			0		0	0
+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
+127.0.0.1	root	9306	60		4	mysql-relay-bin.001	4		No	No			0		0	0
 slave start;
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.001	79	Yes			0		0	1
+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
+127.0.0.1	root	9306	60	master-bin.001	79	mysql-relay-bin.001	120	master-bin.001	Yes	Yes			0		0	79
 drop table if exists t1;
 create table t1 (n int);
 insert into t1 values (10),(45),(90);
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result
index 405e0302161..e3510ec2d94 100644
--- a/mysql-test/r/rpl000016.result
+++ b/mysql-test/r/rpl000016.result
@@ -14,8 +14,8 @@ drop table if exists t1;
 create table t1 (s text);
 insert into t1 values('Could not break slave'),('Tried hard');
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.001	234	Yes			0		0	3
+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
+127.0.0.1	root	9306	60	master-bin.001	234	mysql-relay-bin.001	275	master-bin.001	Yes	Yes			0		0	234
 select * from t1;
 s
 Could not break slave
@@ -42,8 +42,8 @@ Log_name
 master-bin.003
 insert into t2 values (65);
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.003	155	Yes			0		0	3
+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
+127.0.0.1	root	9306	60	master-bin.003	155	mysql-relay-bin.001	793	master-bin.003	Yes	Yes			0		0	155
 select * from t2;
 m
 34
@@ -65,8 +65,8 @@ master-bin.006	445
 slave stop;
 slave start;
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9306	60	master-bin.006	445	Yes			0		0	7
+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
+127.0.0.1	root	9306	60	master-bin.006	445	mysql-relay-bin.004	1376	master-bin.006	Yes	Yes			0		0	445
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
 count(*)
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 27a19f49874..4e6588d39f2 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -15,48 +15,48 @@ create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
 drop table t1;
 show binlog events;
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
-master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
-master-bin.001	172	Intvar	1	3	INSERT_ID=1
-master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
-master-bin.001	263	Query	1	5	use test; drop table t1
-master-bin.001	311	Query	1	6	use test; create table t1 (word char(20) not null)
-master-bin.001	386	Create_file	1	7	db=test;table=t1;file_id=1;block_len=81
-master-bin.001	556	Exec_load	1	8	;file_id=1
-master-bin.001	579	Query	1	9	use test; drop table t1
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.001	4	Start	1	4	Server ver: 4.0.1-alpha-debug-log, Binlog ver: 3
+master-bin.001	79	Query	1	79	use test; create table t1(n int not null auto_increment primary key)
+master-bin.001	172	Intvar	1	172	INSERT_ID=1
+master-bin.001	200	Query	1	200	use test; insert into t1 values (NULL)
+master-bin.001	263	Query	1	263	use test; drop table t1
+master-bin.001	311	Query	1	311	use test; create table t1 (word char(20) not null)
+master-bin.001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=81
+master-bin.001	556	Exec_load	1	556	;file_id=1
+master-bin.001	579	Query	1	579	use test; drop table t1
 show binlog events from 79 limit 1;
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.001	79	Query	1	79	use test; create table t1(n int not null auto_increment primary key)
 show binlog events from 79 limit 2;
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
-master-bin.001	172	Intvar	1	3	INSERT_ID=1
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.001	79	Query	1	79	use test; create table t1(n int not null auto_increment primary key)
+master-bin.001	172	Intvar	1	172	INSERT_ID=1
 show binlog events from 79 limit 2,1;
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.001	200	Query	1	200	use test; insert into t1 values (NULL)
 flush logs;
 create table t1 (n int);
 insert into t1 values (1);
 drop table t1;
 show binlog events;
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
-master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
-master-bin.001	172	Intvar	1	3	INSERT_ID=1
-master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
-master-bin.001	263	Query	1	5	use test; drop table t1
-master-bin.001	311	Query	1	6	use test; create table t1 (word char(20) not null)
-master-bin.001	386	Create_file	1	7	db=test;table=t1;file_id=1;block_len=81
-master-bin.001	556	Exec_load	1	8	;file_id=1
-master-bin.001	579	Query	1	9	use test; drop table t1
-master-bin.001	627	Rotate	1	10	master-bin.002;pos=4
-master-bin.001	668	Stop	1	11	
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.001	4	Start	1	4	Server ver: 4.0.1-alpha-debug-log, Binlog ver: 3
+master-bin.001	79	Query	1	79	use test; create table t1(n int not null auto_increment primary key)
+master-bin.001	172	Intvar	1	172	INSERT_ID=1
+master-bin.001	200	Query	1	200	use test; insert into t1 values (NULL)
+master-bin.001	263	Query	1	263	use test; drop table t1
+master-bin.001	311	Query	1	311	use test; create table t1 (word char(20) not null)
+master-bin.001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=81
+master-bin.001	556	Exec_load	1	556	;file_id=1
+master-bin.001	579	Query	1	579	use test; drop table t1
+master-bin.001	627	Rotate	1	627	master-bin.002;pos=4
+master-bin.001	668	Stop	1	668	
 show binlog events in 'master-bin.002';
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.002	4	Query	1	1	use test; create table t1 (n int)
-master-bin.002	62	Query	1	2	use test; insert into t1 values (1)
-master-bin.002	122	Query	1	3	use test; drop table t1
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+master-bin.002	4	Query	1	4	use test; create table t1 (n int)
+master-bin.002	62	Query	1	62	use test; insert into t1 values (1)
+master-bin.002	122	Query	1	122	use test; drop table t1
 show master logs;
 Log_name
 master-bin.001
@@ -67,45 +67,45 @@ Log_name
 slave-bin.001
 slave-bin.002
 show binlog events in 'slave-bin.001' from 4;
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.001	4	Start	2	1	Server ver: $VERSION, Binlog ver: 2
-slave-bin.001	79	Slave	2	3	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.001,pos=4
-slave-bin.001	132	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
-slave-bin.001	225	Intvar	1	3	INSERT_ID=1
-slave-bin.001	253	Query	1	4	use test; insert into t1 values (NULL)
-slave-bin.001	316	Query	1	5	use test; drop table t1
-slave-bin.001	364	Query	1	6	use test; create table t1 (word char(20) not null)
-slave-bin.001	439	Create_file	1	7	db=test;table=t1;file_id=1;block_len=81
-slave-bin.001	618	Exec_load	1	8	;file_id=1
-slave-bin.001	641	Query	1	9	use test; drop table t1
-slave-bin.001	689	Rotate	1	4	slave-bin.002;pos=4; forced by master
-slave-bin.001	729	Stop	2	5	
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+slave-bin.001	4	Start	2	4	Server ver: 4.0.1-alpha-debug-log, Binlog ver: 3
+slave-bin.001	79	Slave	2	79	host=127.0.0.1,port=9306,log=master-bin.001,pos=4
+slave-bin.001	132	Query	1	79	use test; create table t1(n int not null auto_increment primary key)
+slave-bin.001	225	Intvar	1	200	INSERT_ID=1
+slave-bin.001	253	Query	1	200	use test; insert into t1 values (NULL)
+slave-bin.001	316	Query	1	263	use test; drop table t1
+slave-bin.001	364	Query	1	311	use test; create table t1 (word char(20) not null)
+slave-bin.001	439	Create_file	1	386	db=test;table=t1;file_id=1;block_len=81
+slave-bin.001	618	Exec_load	1	556	;file_id=1
+slave-bin.001	641	Query	1	579	use test; drop table t1
+slave-bin.001	689	Rotate	1	627	slave-bin.002;pos=4; forced by master
+slave-bin.001	729	Stop	2	729	
 show binlog events in 'slave-bin.002' from 4;
-Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.002	4	Slave	2	10	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4
-slave-bin.002	57	Query	1	1	use test; create table t1 (n int)
-slave-bin.002	115	Query	1	2	use test; insert into t1 values (1)
-slave-bin.002	175	Query	1	3	use test; drop table t1
+Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
+slave-bin.002	4	Slave	2	627	host=127.0.0.1,port=9306,log=master-bin.002,pos=4
+slave-bin.002	57	Query	1	4	use test; create table t1 (n int)
+slave-bin.002	115	Query	1	62	use test; insert into t1 values (1)
+slave-bin.002	175	Query	1	122	use test; drop table t1
 show slave status;
-Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.002	170	Yes			0		0	3
+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
+127.0.0.1	root	9306	1	master-bin.002	170	mysql-relay-bin.002	935	master-bin.002	Yes	Yes			0		0	170
 show new master for slave with master_log_file='master-bin.001' and
-master_log_pos=4 and master_log_seq=1 and master_server_id=1;
+master_log_pos=4 and  master_server_id=1;
 Log_name	Log_pos
 slave-bin.001	132
 show new master for slave with master_log_file='master-bin.001' and
-master_log_pos=79 and master_log_seq=2 and master_server_id=1;
+master_log_pos=79 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.001	225
 show new master for slave with master_log_file='master-bin.001' and
-master_log_pos=311 and master_log_seq=6 and master_server_id=1;
+master_log_pos=311 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.001	439
 show new master for slave with master_log_file='master-bin.002' and
-master_log_pos=4 and master_log_seq=1 and master_server_id=1;
+master_log_pos=4 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.002	57
 show new master for slave with master_log_file='master-bin.002' and
-master_log_pos=137 and master_log_seq=3 and master_server_id=1;
+master_log_pos=122 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.002	223
diff --git a/mysql-test/resolve-stack b/mysql-test/resolve-stack
new file mode 100755
index 00000000000..cdbe362c752
--- /dev/null
+++ b/mysql-test/resolve-stack
@@ -0,0 +1,8 @@
+#! /bin/sh
+# A shortcut for resolving stacks when debugging when
+# we cannot duplicate the crash in a debugger and have to
+# resort to using stack traces
+
+nm --numeric-sort ../sql/mysqld > var/tmp/mysqld.sym
+echo "Please type or paste the numeric stack trace,Ctrl-C to quit:"
+../extra/resolve_stack_dump -s var/tmp/mysqld.sym
diff --git a/mysql-test/t/rpl000016-slave.opt b/mysql-test/t/rpl000016-slave.opt
new file mode 100644
index 00000000000..f27601e0d7d
--- /dev/null
+++ b/mysql-test/t/rpl000016-slave.opt
@@ -0,0 +1 @@
+-O max_binlog_size=2048
diff --git a/mysql-test/t/rpl000016-slave.sh b/mysql-test/t/rpl000016-slave.sh
index 62748605af1..9259f593e54 100755
--- a/mysql-test/t/rpl000016-slave.sh
+++ b/mysql-test/t/rpl000016-slave.sh
@@ -1 +1,2 @@
 rm -f $MYSQL_TEST_DIR/var/slave-data/master.info
+rm -f $MYSQL_TEST_DIR/var/slave-data/*relay*
diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/t/rpl000017-slave.sh
index c717500ae4a..555427a2376 100755
--- a/mysql-test/t/rpl000017-slave.sh
+++ b/mysql-test/t/rpl000017-slave.sh
@@ -1,3 +1,4 @@
+rm -f $MYSQL_TEST_DIR/var/slave-data/*relay*
 cat > $MYSQL_TEST_DIR/var/slave-data/master.info <<EOF
 master-bin.001
 4
diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test
index 841524d57e6..0a5c62ed8d5 100644
--- a/mysql-test/t/rpl_log.test
+++ b/mysql-test/t/rpl_log.test
@@ -37,13 +37,13 @@ show binlog events in 'slave-bin.001' from 4;
 show binlog events in 'slave-bin.002' from 4;
 show slave status;
 show new master for slave with master_log_file='master-bin.001' and
- master_log_pos=4 and master_log_seq=1 and master_server_id=1;
+ master_log_pos=4 and  master_server_id=1;
 show new master for slave with master_log_file='master-bin.001' and
- master_log_pos=79 and master_log_seq=2 and master_server_id=1;
+ master_log_pos=79 and master_server_id=1;
 show new master for slave with master_log_file='master-bin.001' and
- master_log_pos=311 and master_log_seq=6 and master_server_id=1;
+ master_log_pos=311 and master_server_id=1;
 show new master for slave with master_log_file='master-bin.002' and
- master_log_pos=4 and master_log_seq=1 and master_server_id=1;
+ master_log_pos=4 and master_server_id=1;
 show new master for slave with master_log_file='master-bin.002' and
- master_log_pos=137 and master_log_seq=3 and master_server_id=1;
+ master_log_pos=122 and master_server_id=1;