diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 17:48:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 17:48:36 +0100 |
| commit | 7f19330c595e3183d079fe2c18eecc74740e8f83 (patch) | |
| tree | 8b853976cd14d96d5415757be525133b32be0c93 /sql/wsrep_thd.cc | |
| parent | 4046ed12bcddfd831c510b022cb7af224be9457b (diff) | |
| parent | f4421c893b50f05078f14d33c47d21f52f59f8a7 (diff) | |
| download | mariadb-git-7f19330c595e3183d079fe2c18eecc74740e8f83.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Diffstat (limited to 'sql/wsrep_thd.cc')
| -rw-r--r-- | sql/wsrep_thd.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index 9e608f94848..ab09a9e3a99 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -215,6 +215,7 @@ void wsrep_replay_transaction(THD *thd) */ MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da()); thd->m_statement_psi= NULL; + thd->m_digest= NULL; thd_proc_info(thd, "wsrep replaying trx"); WSREP_DEBUG("replay trx: %s %lld", thd->query() ? thd->query() : "void", @@ -274,8 +275,10 @@ void wsrep_replay_transaction(THD *thd) wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle); break; default: - WSREP_ERROR("trx_replay failed for: %d, query: %s", - rcode, thd->query() ? thd->query() : "void"); + WSREP_ERROR("trx_replay failed for: %d, schema: %s, query: %s", + rcode, + (thd->db ? thd->db : "(null)"), + thd->query() ? thd->query() : "void"); /* we're now in inconsistent state, must abort */ /* http://bazaar.launchpad.net/~codership/codership-mysql/5.6/revision/3962#sql/wsrep_thd.cc */ @@ -608,3 +611,8 @@ int wsrep_thd_in_locking_session(void *thd_ptr) return 0; } +bool wsrep_thd_has_explicit_locks(THD *thd) +{ + assert(thd); + return thd->mdl_context.has_explicit_locks(); +} |