diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-27 17:28:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-24 14:48:08 +0200 |
| commit | 329058be298a471006e55a674db1c4d769acaf67 (patch) | |
| tree | 15b06cd31a74ad39aeff25abfb7d48fa4db094f1 /sql/events.cc | |
| parent | 0140bfac5e216bd7ba8ad324bd914d596bf59a1f (diff) | |
| download | mariadb-git-329058be298a471006e55a674db1c4d769acaf67.tar.gz | |
wsrep: create a macro for the error: label
that is used by WSREP_TO_ISOLATION_BEGIN and other galera macros,
to avoid the need for wrapping this label in #ifdef WITH_WSREP/#endif
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 3fdb432cba6..187a3208d9f 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 */ } |