Commit 2dc1c7e2 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge dev:my/mysql-5.1-release 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1.24-release
parents 49d1eeae 984ea1a3

mysql-test/include/master-slave-reset.inc

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ connection slave; 
#(the server was started with skip-slave-start)

--disable_warnings

stop slave;

--wait_for_slave_to_stop

source include/wait_for_slave_to_stop.inc;

--enable_warnings

connection master;

--disable_warnings
@@ -20,3 +20,4 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

start slave;

source include/wait_for_slave_to_start.inc;

mysql-test/suite/rpl/t/rpl_insert.test

+6 −3
Original line number Diff line number Diff line
@@ -18,10 +18,13 @@ let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With 


# Wait until all the 5000 inserts has been inserted into the table

let $wait_condition= SELECT COUNT(*) = 5000 FROM mysqlslap.t1;

--source include/wait_condition.inc



source include/wait_condition.inc;

SELECT COUNT(*) FROM mysqlslap.t1;

sync_slave_with_master;



connection slave;

# Wait until all the 5000 inserts has been inserted into the table

let $wait_condition= SELECT COUNT(*) = 5000 FROM mysqlslap.t1;

source include/wait_condition.inc;

SELECT COUNT(*) FROM mysqlslap.t1;



--echo #