Commit bb189764 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-vanilla

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
parents 7feb6c1a 4c7fea8f
...@@ -84,6 +84,7 @@ let $message=< ---- Master selects-- >; ...@@ -84,6 +84,7 @@ let $message=< ---- Master selects-- >;
--source include/show_msg.inc --source include/show_msg.inc
connection master; connection master;
CALL test.p1(); CALL test.p1();
let $wait_condition= SELECT COUNT(*) = 4 FROM t3; let $wait_condition= SELECT COUNT(*) = 4 FROM t3;
--source include/wait_condition.inc --source include/wait_condition.inc
SELECT * FROM test.t3 ORDER BY id3; SELECT * FROM test.t3 ORDER BY id3;
...@@ -91,6 +92,8 @@ SELECT * FROM test.t3 ORDER BY id3; ...@@ -91,6 +92,8 @@ SELECT * FROM test.t3 ORDER BY id3;
let $message=< ---- Slave selects-- >; let $message=< ---- Slave selects-- >;
--source include/show_msg.inc --source include/show_msg.inc
connection slave; connection slave;
let $wait_condition= SELECT COUNT(*) = 4 FROM t3;
--source include/wait_condition.inc
SELECT * FROM test.t3 ORDER BY id3; SELECT * FROM test.t3 ORDER BY id3;
connection master; connection master;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment