summaryrefslogtreecommitdiff
path: root/storage/spider
diff options
context:
space:
mode:
authorKentoku SHIBA <kentokushiba@gmail.com>2014-03-25 04:14:30 +0900
committerKentoku SHIBA <kentokushiba@gmail.com>2014-03-25 04:14:30 +0900
commit01d129489c0a796ad26593146cbaaa6ed1a19fd6 (patch)
tree5f937ccf75f508488bda3f7c1e805073ed4ae1db /storage/spider
parentd64c82517db4c379c328b2466d8bba59810b4e89 (diff)
downloadmariadb-git-01d129489c0a796ad26593146cbaaa6ed1a19fd6.tar.gz
crash if data node down before commit
Diffstat (limited to 'storage/spider')
-rw-r--r--storage/spider/spd_trx.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
index cf3fe3580c7..017c4c41c3d 100644
--- a/storage/spider/spd_trx.cc
+++ b/storage/spider/spd_trx.cc
@@ -3114,6 +3114,7 @@ int spider_commit(
error_num = tmp_error_num;
}
trx->trx_xa = FALSE;
+ trx->join_trx_top = NULL;
} else {
if ((conn = spider_tree_first(trx->join_trx_top)))
{
@@ -3183,6 +3184,7 @@ int spider_rollback(
error_num = tmp_error_num;
}
trx->trx_xa = FALSE;
+ trx->join_trx_top = NULL;
} else {
if ((conn = spider_tree_first(trx->join_trx_top)))
{