Skip to content

M
MariaDB
Commit 6a55aeb2 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.1 into 10.2

parents e55cc2d8 864f0005
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
storage/innobase/row/row0merge.cc
View file @ 6a55aeb2
......@@ -2555,6 +2555,7 @@ row_merge_read_clustered_index(
}
}
merge_buf[i] = row_merge_buf_empty(buf);
buf = merge_buf[i];
if (UNIV_LIKELY(row != NULL)) {
/* Try writing the record again, now
......
storage/xtradb/row/row0merge.cc
View file @ 6a55aeb2
......@@ -1929,6 +1929,7 @@ row_merge_read_clustered_index(
UNIV_MEM_INVALID(&block[0], srv_sort_buf_size);
merge_buf[i] = row_merge_buf_empty(buf);
buf = merge_buf[i];
if (UNIV_LIKELY(row != NULL)) {
/* Try writing the record again, now
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7