Commit f48aa05f authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
parents 38b406ce c5fefc68

mysql-test/extra/rpl_tests/rpl_loaddata.test

+0 −7
Original line number Diff line number Diff line
@@ -39,13 +39,6 @@ sync_with_master; 


select * from t1;

select * from t3;

# We want to be sure that LOAD DATA is in the slave's binlog.

# But we can't simply read this binlog, because as the slave has not been

# restarted for this test, the file_id is uncertain (would cause test

# failures). So instead, we test if the binlog looks long enough to

# contain LOAD DATA. Since 5.0.3 we assume that binlog of 1292 is ok.

# If LOAD DATA was not logged, the binlog would be shorter.

show master status;



connection master;

mysql-test/extra/rpl_tests/rpl_log.test

+1 −1
Original line number Diff line number Diff line
@@ -148,5 +148,5 @@ drop table t1; 


# End of 4.1 tests



sync_with_master;

sync_slave_with_master;

mysql-test/suite/rpl/r/rpl_loaddata.result

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ day id category name 
2003-02-22	2461	b	a a a @ %  ' " a

2003-03-22	2161	c	asdf

2003-03-22	2416	a	bbbbb

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

slave-bin.000001	1280		

drop table t1;

drop table t2;

drop table t3;

mysql-test/suite/rpl/r/rpl_master_pos_wait.result

+6 −0
Original line number Diff line number Diff line
@@ -16,3 +16,9 @@ select master_pos_wait('master-bin.999999',0); 
stop slave sql_thread;

master_pos_wait('master-bin.999999',0)

NULL

"*** must be empty ***"

show slave status;

"*** must be NULL ***"

select master_pos_wait('foo', 98);

master_pos_wait('foo', 98)

NULL

mysql-test/suite/rpl/r/rpl_skip_error.result

+59 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ insert into t1 values (1); 
insert into t1 values (1);

insert into t1 values (2),(3);

[on slave]

select * from t1 ORDER BY n;

select * from t1 order by n;

n

1

2
@@ -24,7 +24,7 @@ insert into t1 values (7), (8); 
set sql_mode=strict_trans_tables;

insert into t1 values (7), (8), (9);

[on slave]

select * from t1;

select * from t1 order by n;

n

1

2
@@ -72,3 +72,59 @@ Last_SQL_Errno 0 
Last_SQL_Error	

==== Clean Up ====

drop table t1;

create table t1(a int primary key);

insert into t1 values (1),(2);

delete from t1 where @@server_id=1;

Warnings:

Warning	1592	Statement is not safe to log in statement format.

set sql_mode=strict_trans_tables;

insert into t1 values (7), (8), (9);

[on slave]

select * from t1;

a

1

2

7

8

9

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	#

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	0

Last_SQL_Error	

==== Clean Up ====

drop table t1;