diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-06-13 09:55:28 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-06-13 09:55:28 +0300 |
| commit | b0d30e234efeddd4b1ee62e89b510b5d64a5ec07 (patch) | |
| tree | 735339bd12247df75247da7691a24106ae89d506 /sql/slave.cc | |
| parent | bf9d5b7f64f6e1c8b679dc941d7d1537cfccee65 (diff) | |
| download | mariadb-git-b0d30e234efeddd4b1ee62e89b510b5d64a5ec07.tar.gz | |
References lp:1169326 - merged fix from LP wsrep-5.5-23
Now at revision 3874 in lp:~codership/codership-mysql/5.5-23
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index caef5acd5f1..c89ae69698f 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2602,23 +2602,6 @@ int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli) ev->thd = thd; // because up to this point, ev->thd == 0 int reason= ev->shall_skip(rli); -#ifdef WITH_WSREP - if (WSREP_ON && (ev->get_type_code() == XID_EVENT || - (ev->get_type_code() == QUERY_EVENT && thd->wsrep_mysql_replicated > 0 && - (!strncasecmp(((Query_log_event*)ev)->query , "BEGIN", 5) || - !strncasecmp(((Query_log_event*)ev)->query , "COMMIT", 6) )))) - { - if (++thd->wsrep_mysql_replicated < (int)wsrep_mysql_replication_bundle) - { - WSREP_DEBUG("skipping wsrep commit %d", thd->wsrep_mysql_replicated); - reason = Log_event::EVENT_SKIP_IGNORE; - } - else - { - thd->wsrep_mysql_replicated = 0; - } - } -#endif if (reason == Log_event::EVENT_SKIP_COUNT) sql_slave_skip_counter= --rli->slave_skip_counter; mysql_mutex_unlock(&rli->data_lock); |