diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-20 16:15:32 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-20 16:15:32 +0200 |
| commit | 0455ff8faf97da88c0a1cb42a615e75f43e40012 (patch) | |
| tree | ad04f8d12a4298688bd483489962e02e164e8f92 /mysql-test/include/wait_for_slave_param.inc | |
| parent | 05062d579a81ce9378560bee573f5769a94c579a (diff) | |
| download | mariadb-git-0455ff8faf97da88c0a1cb42a615e75f43e40012.tar.gz | |
Follow-up to Bug #55582 which allows chaecking strings in if
Simplified cases where a select was used to compare variable against ''
Diffstat (limited to 'mysql-test/include/wait_for_slave_param.inc')
| -rw-r--r-- | mysql-test/include/wait_for_slave_param.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc index ef864f9245e..98cd426fa11 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -51,7 +51,7 @@ if (!$_slave_timeout_counter) } let $_slave_param_comparison= $slave_param_comparison; -if (`SELECT '$_slave_param_comparison' = ''`) +if (!$_slave_param_comparison) { let $_slave_param_comparison= =; } @@ -71,7 +71,7 @@ while (`SELECT NOT('$_show_slave_status_value' $_slave_param_comparison '$slave_ if (!$_slave_timeout_counter) { --echo **** ERROR: timeout after $slave_timeout seconds while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value **** - if (`SELECT '$slave_error_message' != ''`) + if ($slave_error_message) { --echo Message: $slave_error_message } |