diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 08:41:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 08:41:48 +0200 |
| commit | 32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76 (patch) | |
| tree | 098d64b7c988bab8cca25b0f716d92f6f7e72ed9 /sql/events.cc | |
| parent | af9649c722810eb1754953eb406a84ec876ce693 (diff) | |
| parent | bae21bfb5de17328c33c3da8d191c6d3af14ae02 (diff) | |
| download | mariadb-git-32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sql/events.cc b/sql/events.cc index e914dba1009..cd0257f5317 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -418,10 +418,10 @@ Events::create_event(THD *thd, Event_parse_data *parse_data) thd->restore_stmt_binlog_format(save_binlog_format); DBUG_RETURN(ret); -#ifdef WITH_WSREP - error: + +WSREP_ERROR_LABEL: DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ + } @@ -549,10 +549,9 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, thd->restore_stmt_binlog_format(save_binlog_format); DBUG_RETURN(ret); -#ifdef WITH_WSREP -error: + +WSREP_ERROR_LABEL: DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ } @@ -616,10 +615,9 @@ Events::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name, bool if_exists) thd->restore_stmt_binlog_format(save_binlog_format); DBUG_RETURN(ret); -#ifdef WITH_WSREP -error: + +WSREP_ERROR_LABEL: DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ } |