summaryrefslogtreecommitdiff
path: root/sql/wsrep_applier.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-06-19 00:17:25 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-06-19 00:17:25 -0400
commit8c44fd63ac61161e92e7feb55d693d72aebac68d (patch)
treeec3bf31837fea5c01a8cf0c66dfd9ce1c7d7cae7 /sql/wsrep_applier.cc
parent6d5b723bdc3e04978619b9673fca266e0426916f (diff)
downloadmariadb-git-8c44fd63ac61161e92e7feb55d693d72aebac68d.tar.gz
MDEV-8239 : Idle threads post-execution end up in closing tables state
Set thd's state to 'committed' only after it has done closing tables (called indirectly by relay_group_info::cleanup_context()).
Diffstat (limited to 'sql/wsrep_applier.cc')
-rw-r--r--sql/wsrep_applier.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc
index 9fdc3952f3f..4d95b38a371 100644
--- a/sql/wsrep_applier.cc
+++ b/sql/wsrep_applier.cc
@@ -295,14 +295,6 @@ static wsrep_cb_status_t wsrep_commit(THD* const thd,
wsrep_cb_status_t const rcode(trans_commit(thd) ?
WSREP_CB_FAILURE : WSREP_CB_SUCCESS);
-#ifdef WSREP_PROC_INFO
- snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
- "committed %lld", (long long)wsrep_thd_trx_seqno(thd));
- thd_proc_info(thd, thd->wsrep_info);
-#else
- thd_proc_info(thd, "committed");
-#endif /* WSREP_PROC_INFO */
-
if (WSREP_CB_SUCCESS == rcode)
{
thd->wsrep_rgi->cleanup_context(thd, false);
@@ -312,6 +304,14 @@ static wsrep_cb_status_t wsrep_commit(THD* const thd,
// TODO: mark snapshot with global_seqno.
}
+#ifdef WSREP_PROC_INFO
+ snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
+ "committed %lld", (long long) wsrep_thd_trx_seqno(thd));
+ thd_proc_info(thd, thd->wsrep_info);
+#else
+ thd_proc_info(thd, "committed");
+#endif /* WSREP_PROC_INFO */
+
return rcode;
}