diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-03-28 17:29:10 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-03-28 17:29:10 -0400 |
| commit | 84a4db263a1d98e9a2f3c6b5816a9b6b9a019128 (patch) | |
| tree | 34e88fe5c34eef90f550fe96aec38934ac00fc55 /sql/wsrep_applier.cc | |
| parent | 555915faa9fc5ec0a7df09b51716be027120fa8c (diff) | |
| parent | d7445ea6dfbd3be390792c636f755d3bb40d5fbf (diff) | |
| download | mariadb-git-84a4db263a1d98e9a2f3c6b5816a9b6b9a019128.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index f8e82f6b805..8e5c49332a7 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -76,13 +76,10 @@ static inline Format_description_log_event* wsrep_get_apply_format(THD* thd) { if (thd->wsrep_apply_format) - return (Format_description_log_event*) thd->wsrep_apply_format; - /* TODO: mariadb does not support rli->get_rli_description_event() - * => look for alternative way to remember last FDE in replication - */ - //return thd->wsrep_rli->get_rli_description_event(); - thd->wsrep_apply_format = new Format_description_log_event(4); - return (Format_description_log_event*) thd->wsrep_apply_format; + { + return (Format_description_log_event*) thd->wsrep_apply_format; + } + return thd->wsrep_rgi->rli->relay_log.description_event_for_exec; } static wsrep_cb_status_t wsrep_apply_events(THD* thd, |