Commit a91ac47c authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

show master forced rotate info in SHOW BINLOG EVENTS 

mark a master-forced rotate with a special flag
parent c71cba0b

mysql-test/r/rpl000014.result

+8 −8
Original line number Diff line number Diff line 
File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	79		

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

127.0.0.1	root	9999	1	master-bin.001	79	Yes			0		0

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

127.0.0.1	root	9999	1	master-bin.001	73	No			0		0

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

127.0.0.1	root	9999	1	master-bin.001	73	Yes			0		0

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

127.0.0.1	root	9999	1	master-bin.001	173	Yes			0		0

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	9999	1	master-bin.001	79	Yes			0		0	1

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	9999	1	master-bin.001	73	No			0		0	1

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	9999	1	master-bin.001	73	Yes			0		0	1

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	9999	1	master-bin.001	173	Yes			0		0	1

File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	79		

n

mysql-test/r/rpl000015.result

+8 −8
Original line number Diff line number Diff line 
File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	79		

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

		0	0		0	No			0		0

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

127.0.0.1	test	9998	60		4	No			0		0

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

127.0.0.1	root	9999	60		4	No			0		0

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

127.0.0.1	root	9999	60	master-bin.001	79	Yes			0		0

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	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	9998	60		4	No			0		0	0

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	9999	60		4	No			0		0	0

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	9999	60	master-bin.001	79	Yes			0		0	1

n

10

45

mysql-test/r/rpl000016.result

+6 −6
Original line number Diff line number Diff line 
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

127.0.0.1	root	9999	60	master-bin.001	234	Yes			0		0

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	9999	60	master-bin.001	234	Yes			0		0	3

s

Could not break slave

Tried hard
@@ -9,8 +9,8 @@ master-bin.002 
master-bin.003

Log_name

master-bin.003

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

127.0.0.1	root	9999	60	master-bin.003	202	Yes			0		0

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	9999	60	master-bin.003	202	Yes			0		0	3

m

34

65
@@ -24,7 +24,7 @@ master-bin.005 
master-bin.006

File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.006	720		

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

127.0.0.1	root	9999	60	master-bin.006	720	Yes			0		0

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	9999	60	master-bin.006	720	Yes			0		0	11

count(*)

100

mysql-test/r/rpl_log.result

+9 −1
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ master-bin.001 516 Rotate 1 9 master-bin.002 
master-bin.001	549	Stop	1	10	

Log_name	Pos	Event_type	Server_id	Log_seq	Info

master-bin.002	4	Start	1	1	Server ver: 4.0.0-debug-log, Binlog ver: 2

master-bin.002	79	Query	1	2	use test; create table t1 (n int)

master-bin.002	137	Query	1	3	use test; insert into t1 values (1)

master-bin.002	197	Query	1	4	use test; drop table t1

Log_name

master-bin.001

master-bin.002
@@ -42,8 +45,13 @@ 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	Query	1	8	use test; drop table t1

slave-bin.001	487	Rotate	2	3	slave-bin.002

slave-bin.001	487	Rotate	2	3	slave-bin.002; forced by master

slave-bin.001	519	Stop	2	4	

Log_name	Pos	Event_type	Server_id	Log_seq	Info

slave-bin.002	4	Start	2	1	Server ver: 4.0.0-debug-log, Binlog ver: 2

slave-bin.002	79	Slave	2	2	host=127.0.0.1,port=9306,log=master-bin.002,pos=4

slave-bin.002	132	Query	1	2	use test; create table t1 (n int)

slave-bin.002	190	Query	1	3	use test; insert into t1 values (1)

slave-bin.002	250	Query	1	4	use test; drop table t1

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	9999	1	master-bin.002	245	Yes			0		0	4

mysql-test/t/rpl000017-slave.sh

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ replicate 
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

9306

1

0

EOF