Commit a3daffde authored by marko's avatar marko

btr_cur_search_to_nth_level(): Reacquire btr_search_latch after inserting

to the insert buffer.  This was noticed while analyzing Bug #19081, but
this should not fix Bug #19081, since according to Heikki, btr_search_latch
is not reserved during an insert.
parent f9449791
...@@ -455,7 +455,7 @@ btr_cur_search_to_nth_level( ...@@ -455,7 +455,7 @@ btr_cur_search_to_nth_level(
if (UNIV_LIKELY_NULL(heap)) { if (UNIV_LIKELY_NULL(heap)) {
mem_heap_free(heap); mem_heap_free(heap);
} }
return; goto func_exit;
} }
/* Insert to the insert buffer did not succeed: /* Insert to the insert buffer did not succeed:
...@@ -571,6 +571,7 @@ btr_cur_search_to_nth_level( ...@@ -571,6 +571,7 @@ btr_cur_search_to_nth_level(
|| mode != PAGE_CUR_LE); || mode != PAGE_CUR_LE);
} }
func_exit:
if (has_search_latch) { if (has_search_latch) {
rw_lock_s_lock(&btr_search_latch); rw_lock_s_lock(&btr_search_latch);
......
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