Skip to content
Permalink
Browse files

Merge 10.1 into 10.2

  • Loading branch information...
dr-m committed Jul 18, 2019
2 parents e55cc2d + 864f000 commit 6a55aeb2afa11ae04c7e467bee71875fa3bf029a
Showing with 2 additions and 0 deletions.
  1. +1 −0 storage/innobase/row/row0merge.cc
  2. +1 −0 storage/xtradb/row/row0merge.cc
@@ -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
@@ -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

0 comments on commit 6a55aeb

Please sign in to comment.
You can’t perform that action at this time.