Skip to content

M
mariadb
Commit 40468572 authored by Andrei Elkin's avatar Andrei Elkin
Browse files
Options

correction to the earlier merging: s/return/DBUG_RETURN/

parent ad3d84e9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/rpl_rli.cc
View file @ 40468572
...@@ -1033,7 +1033,7 @@ bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev) ...@@ -1033,7 +1033,7 @@ bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev)
if (until_condition == UNTIL_MASTER_POS) if (until_condition == UNTIL_MASTER_POS)
{ {
if (ev && ev->server_id == (uint32) ::server_id && !replicate_same_server_id) if (ev && ev->server_id == (uint32) ::server_id && !replicate_same_server_id)
return FALSE; DBUG_RETURN(FALSE);
log_name= group_master_log_name; log_name= group_master_log_name;
log_pos= (!ev)? group_master_log_pos : log_pos= (!ev)? group_master_log_pos :
((thd->options & OPTION_BEGIN || !ev->log_pos) ? ((thd->options & OPTION_BEGIN || !ev->log_pos) ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7