summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@oracle.com>2012-01-31 17:07:44 +0200
committerAndrei Elkin <andrei.elkin@oracle.com>2012-01-31 17:07:44 +0200
commitf0167f808247171b778aed5a1a5b225f4ad20fc1 (patch)
tree283eb711157a41b50864f56abcb501a1ec814d68 /mysql-test/extra
parentf91c2d33f4ba3c9b5b69652bd045632c8085f30f (diff)
parent1fcca29745d7e0f69a6ff26dda12a08326a36d9a (diff)
downloadmariadb-git-f0167f808247171b778aed5a1a5b225f4ad20fc1.tar.gz
merge from 5.5 repo.
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/rpl_tests/rpl_start_stop_slave.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test b/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
index 850aee1ce97..0c2992d0a5e 100644
--- a/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
+++ b/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
@@ -200,7 +200,7 @@ START SLAVE;
--let $slave_param_value=1236
--source include/wait_for_slave_param.inc
---let $slave_io_error_replace= / at [0-9]*/ at XXX/ /\.\/*master-bin/master-bin/
+--let $slave_field_result_replace= / at [0-9]*/ at XXX/
--let $status_items= Last_IO_Errno, Last_IO_Error
--source include/show_slave_status.inc