diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 17:07:17 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 17:07:17 -0400 |
| commit | 0b98d2fd2ab337d95b6b502b15ea86368c441026 (patch) | |
| tree | 43b49a7f5ccb94114797fcae41015ab9055685c4 /sql/wsrep_applier.cc | |
| parent | 0903e2b744f627f57a99edd5d2b6ffdec1ef4a03 (diff) | |
| download | mariadb-git-0b98d2fd2ab337d95b6b502b15ea86368c441026.tar.gz | |
bzr merge -r4065..4088 codership/5.6
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 2d859087217..05c32da580d 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -62,7 +62,6 @@ err: #include "rpl_rli.h" // class Relay_log_info; #include "sql_base.h" // close_temporary_table() - static inline void wsrep_set_apply_format(THD* thd, Format_description_log_event* ev) { @@ -94,7 +93,7 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd, int rcode= 0; int event= 1; - DBUG_ENTER("wsrep_apply_rbr"); + DBUG_ENTER("wsrep_apply_events"); if (thd->killed == KILL_CONNECTION) { @@ -118,7 +117,6 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd, Log_event* ev= wsrep_read_log_event(&buf, &buf_len, wsrep_get_apply_format(thd)); - if (!ev) { WSREP_ERROR("applier could not read binlog event, seqno: %lld, len: %zu", @@ -126,6 +124,7 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd, rcode= 1; goto error; } + switch (ev->get_type_code()) { case FORMAT_DESCRIPTION_EVENT: wsrep_set_apply_format(thd, (Format_description_log_event*)ev); @@ -368,6 +367,7 @@ wsrep_cb_status_t wsrep_commit_cb(void* const ctx, return rcode; } + wsrep_cb_status_t wsrep_unordered_cb(void* const ctx, const void* const data, size_t const size) |