Commit 79293053 authored by jmiller@mysql.com's avatar jmiller@mysql.com

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

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
parents 3b989171 2ef6dffe
......@@ -77,11 +77,12 @@ connection slave;
# to go into the relay log (the master always sends a fake one when replication
# starts).
start slave;
#
# This is timing out in pushbuild and should be changed to use
# wait_slave_status.inc
#
sleep 2;
--disable_query_log
--disable_result_log
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000007%Yes%Yes%0%0%None%';
--source include/wait_slave_status.inc
--enable_query_log
--enable_result_log
sync_with_master;
flush logs;
stop slave;
......
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