diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-08 18:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:36 +0200 |
| commit | 03ec3511a82e90310c850ea71b395b214cab1645 (patch) | |
| tree | 65e6b3dea94e4744b5b9a3bfb0f847977ed7d55a /sql/event_parse_data.cc | |
| parent | 8596b70f96fc543c2e1cac4bc8cbe58dcc4004e5 (diff) | |
| download | mariadb-git-03ec3511a82e90310c850ea71b395b214cab1645.tar.gz | |
cleanup: galera misc cleanups
also disable galera-specific output in mysql_tzinfo_to_sql,
it'll be enabled later.
Diffstat (limited to 'sql/event_parse_data.cc')
| -rw-r--r-- | sql/event_parse_data.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc index 7647419aff9..44d89887c3b 100644 --- a/sql/event_parse_data.cc +++ b/sql/event_parse_data.cc @@ -564,7 +564,8 @@ Event_parse_data::init_definer(THD *thd) void Event_parse_data::check_originator_id(THD *thd) { /* Disable replicated events on slave. */ - if ((thd->system_thread == SYSTEM_THREAD_SLAVE_SQL) || + if (IF_WSREP(WSREP(thd) && thd->wsrep_applier, 0) || + (thd->system_thread == SYSTEM_THREAD_SLAVE_SQL) || (thd->system_thread == SYSTEM_THREAD_SLAVE_IO)) { DBUG_PRINT("info", ("Invoked object status set to SLAVESIDE_DISABLED.")); |