1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

auto merge

This commit is contained in:
Alfranio Correia
2008-12-13 19:48:19 +00:00
8 changed files with 44 additions and 22 deletions

View File

@ -7,15 +7,29 @@
#
# source include/wait_for_slave_sql_error.inc;
#
# Parameters to this macro are $slave_timeout and
# $slave_keep_connection. See wait_for_slave_param.inc for
# descriptions.
# Parameters:
#
# $slave_sql_errno
# Number of expected SQL error. If it skipped then any error
# will pass.
#
# $slave_timeout and
# See wait_for_slave_param.inc for descriptions.
#
# $slave_keep_connection.
# See wait_for_slave_param.inc for descriptions.
let $old_slave_param_comparison= $slave_param_comparison;
let $slave_param= Last_SQL_Errno;
let $slave_param_comparison= !=;
let $slave_param_value= 0;
if ($slave_sql_errno) {
let $slave_param_comparison= =;
let $slave_param_value= $slave_sql_errno;
}
let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread;
source include/wait_for_slave_param.inc;
let $slave_error_message= ;