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

Merge work:/home/bk/mysql-4.0 

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 6a8fce39 46de2a9f

mysql-test/r/rpl000014.result

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

master-bin.001	73		

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	73	Yes			0		0

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
@@ -9,7 +9,7 @@ Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Rep 
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

File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	73		

master-bin.001	79		

n

1

2

mysql-test/r/rpl000015.result

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

master-bin.001	73		

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
@@ -7,7 +7,7 @@ Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Rep 
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	73	Yes			0		0

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

n

10

45

mysql-test/r/rpl000016.result

+4 −4
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	216	Yes			0		0

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

s

Could not break slave

Tried hard
@@ -10,7 +10,7 @@ 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	184	Yes			0		0

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

m

34

65
@@ -23,8 +23,8 @@ master-bin.004 
master-bin.005

master-bin.006

File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.006	131		

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	131	Yes			0		0

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

count(*)

100

mysql-test/std_data/master-bin.001

−15 B (98 B)

File changed.

No diff preview for this file type.

View original file
View changed file

mysql-test/t/rpl000014.test

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ create table foo (n int); 
insert into foo values (1),(2),(3);

save_master_pos;

connection slave;

change master to master_log_pos=73;

change master to master_log_pos=79;

sync_with_master;

select * from foo;

connection master;