diff options
Diffstat (limited to 'sql/wsrep_binlog.cc')
| -rw-r--r-- | sql/wsrep_binlog.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc index 787ebc042ae..da899321ba8 100644 --- a/sql/wsrep_binlog.cc +++ b/sql/wsrep_binlog.cc @@ -64,7 +64,7 @@ int wsrep_write_cache_buf(IO_CACHE *cache, uchar **buf, size_t *buf_len) wsrep_max_ws_size, total_length); goto error; } - uchar* tmp= (uchar *)my_realloc(*buf, total_length, + uchar* tmp= (uchar *)my_realloc(PSI_INSTRUMENT_ME, *buf, total_length, MYF(MY_ALLOW_ZERO_PTR)); if (!tmp) { @@ -381,7 +381,9 @@ void wsrep_register_for_group_commit(THD *thd) void wsrep_unregister_from_group_commit(THD *thd) { - DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_ordered_commit); + DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_ordered_commit|| + // ordered_commit() failure results in s_aborting state + thd->wsrep_trx().state() == wsrep::transaction::s_aborting); wait_for_commit *wfc= thd->wait_for_commit_ptr; if (wfc) |