diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-05-09 15:09:40 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-05-09 15:09:40 +0200 |
| commit | e1ceb8048c854b781910d70eb4b3db68585dd032 (patch) | |
| tree | f08d7703c8f0f86a0b7f7589241e779241d5c2d3 /mysql-test | |
| parent | 8882d71f3f1dd03ef98d072def39b29e6a03f5b8 (diff) | |
| parent | e2ff2885319e480477e8f7d2824065ee4f4363a6 (diff) | |
| download | mariadb-git-e1ceb8048c854b781910d70eb4b3db68585dd032.tar.gz | |
Automatic merge Mariadb 5.1->5.2.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_stop_slave.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_stop_slave.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result index ac5eacc7066..56199b003c5 100644 --- a/mysql-test/suite/rpl/r/rpl_stop_slave.result +++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result @@ -168,6 +168,7 @@ STOP SLAVE; ROLLBACK; [connection master] SET DEBUG_SYNC= 'now SIGNAL signal.continue'; +SET DEBUG_SYNC= 'now WAIT_FOR signal.continued'; SET DEBUG_SYNC= 'RESET'; [connection slave] include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test index 8d2b26dd4ea..1502c694ea0 100644 --- a/mysql-test/suite/rpl/t/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test @@ -109,6 +109,7 @@ ROLLBACK; --source include/rpl_connection_master.inc SET DEBUG_SYNC= 'now SIGNAL signal.continue'; +SET DEBUG_SYNC= 'now WAIT_FOR signal.continued'; SET DEBUG_SYNC= 'RESET'; --source include/rpl_connection_slave.inc |