summaryrefslogtreecommitdiff
path: root/mysql-test/include/wait_for_slave_param.inc
diff options
context:
space:
mode:
authorunknown <Li-Bing.Song@sun.com>2010-05-26 22:34:25 +0800
committerunknown <Li-Bing.Song@sun.com>2010-05-26 22:34:25 +0800
commit71e534542bfb6b2cc40909a8bb975fc7564998d0 (patch)
tree20ebc2f49e17beacbc4a6ebcaa6727f8eb8e765d /mysql-test/include/wait_for_slave_param.inc
parent42d91c688c27f9b2496ec6e82535b69ec5d69697 (diff)
parent8f8e1d6fb85d4be1e8e44beb22b26a72f76ac84e (diff)
downloadmariadb-git-71e534542bfb6b2cc40909a8bb975fc7564998d0.tar.gz
Manual merge
Diffstat (limited to 'mysql-test/include/wait_for_slave_param.inc')
-rw-r--r--mysql-test/include/wait_for_slave_param.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc
index 1e690bdfe9c..b0989c3264e 100644
--- a/mysql-test/include/wait_for_slave_param.inc
+++ b/mysql-test/include/wait_for_slave_param.inc
@@ -80,5 +80,5 @@ if (!$_slave_timeout_counter)
--echo Current connection is '$CURRENT_CONNECTION'
echo Note: the following output may have changed since the failure was detected;
source include/show_rpl_debug_info.inc;
- exit;
+ die;
}