diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-07-03 14:02:05 +0400 |
| commit | e61568ee9305c6c93c1a9f298a7fe04532881f24 (patch) | |
| tree | c80b0967460f7c4f8743831690f7369e11c73722 /sql/events.cc | |
| parent | 4b0cedf82d8d8ba582648dcb4a2620c146862a43 (diff) | |
| parent | c3289d27eef39a47fed2ce1ff239013ed6870f39 (diff) | |
| download | mariadb-git-e61568ee9305c6c93c1a9f298a7fe04532881f24.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/events.cc b/sql/events.cc index 49ac4b71100..c13582e634c 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -463,8 +463,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, if (check_access(thd, EVENT_ACL, parse_data->dbname.str, NULL, NULL, 0, 0)) DBUG_RETURN(TRUE); - - WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) + WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); if (lock_object_name(thd, MDL_key::EVENT, parse_data->dbname.str, parse_data->name.str)) @@ -594,8 +593,7 @@ Events::drop_event(THD *thd, const LEX_CSTRING *dbname, if (check_access(thd, EVENT_ACL, dbname->str, NULL, NULL, 0, 0)) DBUG_RETURN(TRUE); - - WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) + WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); /* Turn off row binlogging of this statement and use statement-based so @@ -621,7 +619,7 @@ Events::drop_event(THD *thd, const LEX_CSTRING *dbname, #ifdef WITH_WSREP error: DBUG_RETURN(TRUE); -#endif +#endif /* WITH_WSREP */ } |