Commit 37d0dda4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
parents 54de515d d364bf85

mysql-test/r/rpl_loaddata2.result

+1 −0
Original line number Diff line number Diff line
@@ -150,3 +150,4 @@ Aberdeen 
Abernathy

aberrant

aberration

drop table t1;

mysql-test/r/rpl_redirect.result

+0 −1
Original line number Diff line number Diff line
@@ -39,4 +39,3 @@ n 
4

5

drop table t1;
 
drop table t1;

mysql-test/r/rpl_slave_status.result

+1 −0
Original line number Diff line number Diff line
@@ -53,3 +53,4 @@ Master_SSL_Cipher 
Master_SSL_Key	

Seconds_Behind_Master	NULL

drop table t1;

drop table t1;

mysql-test/t/rpl_LD_INFILE.test

+4 −3
Original line number Diff line number Diff line
@@ -27,11 +27,12 @@ save_master_pos; 
sync_slave_with_master;

connection slave;

SELECT * FROM test.t1 ORDER BY a DESC;

connection master;

# Lets cleanup

#show binlog events;



# Cleanup

#show binlog events;

connection master;

DROP TABLE test.t1;

sync_slave_with_master;



# End of 5.0 test case

mysql-test/t/rpl_drop_temp.test

+3 −0
Original line number Diff line number Diff line
@@ -18,7 +18,10 @@ disconnect master; 
connection slave;

--real_sleep 3 # time for DROP to be written

show status like 'Slave_open_temp_tables';



# Cleanup

connection default;

drop database mysqltest;

sync_slave_with_master;



# End of 4.1 tests