mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
This commit is contained in:
commit
2efbd96b8e
1 changed files with 6 additions and 5 deletions
|
@ -77,11 +77,12 @@ connection slave;
|
||||||
# to go into the relay log (the master always sends a fake one when replication
|
# to go into the relay log (the master always sends a fake one when replication
|
||||||
# starts).
|
# starts).
|
||||||
start slave;
|
start slave;
|
||||||
#
|
--disable_query_log
|
||||||
# This is timing out in pushbuild and should be changed to use
|
--disable_result_log
|
||||||
# wait_slave_status.inc
|
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
|
||||||
sleep 2;
|
--enable_query_log
|
||||||
|
--enable_result_log
|
||||||
sync_with_master;
|
sync_with_master;
|
||||||
flush logs;
|
flush logs;
|
||||||
stop slave;
|
stop slave;
|
||||||
|
|
Loading…
Add table
Reference in a new issue