1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge dev:my/mysql-5.1-release

Browse Source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1.24-release
This commit is contained in:
unknown 2008-04-01 18:17:22 +02:00
commit 5e2b03ce9a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/master-slave-reset.inc
View File

@ -3,7 +3,7 @@ connection slave;
#(the server was started with skip-slave-start) #(the server was started with skip-slave-start)
--disable_warnings --disable_warnings
stop slave; stop slave;
--wait_for_slave_to_stop source include/wait_for_slave_to_stop.inc;
--enable_warnings --enable_warnings
connection master; connection master;
--disable_warnings --disable_warnings
@ -20,3 +20,4 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
--enable_warnings --enable_warnings
start slave; start slave;
source include/wait_for_slave_to_start.inc;

9
mysql-test/suite/rpl/t/rpl_insert.test
View File

@ -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 # Wait until all the 5000 inserts has been inserted into the table
let $wait_condition= SELECT COUNT(*) = 5000 FROM mysqlslap.t1; let $wait_condition= SELECT COUNT(*) = 5000 FROM mysqlslap.t1;
--source include/wait_condition.inc source include/wait_condition.inc;
SELECT COUNT(*) FROM mysqlslap.t1; 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; SELECT COUNT(*) FROM mysqlslap.t1;
--echo # --echo #