Commit cbbd5174 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

[t:4376] reorder merging and status update to avoid access after free


git-svn-id: file:///svn/toku/tokudb@38633 c7de825b-a66e-492c-adef-691d508d4ae1
parent ad064956
...@@ -295,10 +295,10 @@ ctm_maybe_merge_child(struct flusher_advice *fa, ...@@ -295,10 +295,10 @@ ctm_maybe_merge_child(struct flusher_advice *fa,
BRTNODE child, BRTNODE child,
void *extra) void *extra)
{ {
default_merge_child(fa, h, parent, childnum, child, extra);
if (child->height == 0) { if (child->height == 0) {
(void) __sync_fetch_and_add(&brt_flusher_status.cleaner_num_leaf_merges_completed, 1); (void) __sync_fetch_and_add(&brt_flusher_status.cleaner_num_leaf_merges_completed, 1);
} }
default_merge_child(fa, h, parent, childnum, child, extra);
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment