diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-06 18:01:29 -0800 |
| commit | 3f9040085a0de4976f55bc7e4a2fa5fa8d923100 (patch) | |
| tree | cefa82212b688d12a7ca180f7a0a8f32715e2a79 /sql/events.cc | |
| parent | 16327fc2e76e9215059894b461e8aca7f989da00 (diff) | |
| parent | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (diff) | |
| download | mariadb-git-3f9040085a0de4976f55bc7e4a2fa5fa8d923100.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev17096
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sql/events.cc b/sql/events.cc index af020d5240e..196c8df591d 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -336,7 +336,7 @@ Events::create_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)) @@ -420,9 +420,9 @@ Events::create_event(THD *thd, Event_parse_data *parse_data) DBUG_RETURN(ret); #ifdef WITH_WSREP - error: - DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ +wsrep_error_label: + DBUG_RETURN(true); +#endif } @@ -463,6 +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); if (lock_object_name(thd, MDL_key::EVENT, @@ -550,9 +551,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: - DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ +wsrep_error_label: + DBUG_RETURN(true); +#endif } @@ -593,6 +594,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); /* @@ -617,9 +619,9 @@ Events::drop_event(THD *thd, const LEX_CSTRING *dbname, thd->restore_stmt_binlog_format(save_binlog_format); DBUG_RETURN(ret); #ifdef WITH_WSREP -error: - DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ +wsrep_error_label: + DBUG_RETURN(true); +#endif } |