diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
| commit | 87a61355e8e499baf7908862711c26aa0225bf32 (patch) | |
| tree | 7122052c801b5f1ee4a93af2348fad916aa2f86b /storage/innobase/row/row0merge.cc | |
| parent | 7ea413ac2d80c7f03d1dbad90ac30ecddd8b2835 (diff) | |
| parent | bc43bf3e430c20bc2178e584215bd443054709d6 (diff) | |
| download | mariadb-git-87a61355e8e499baf7908862711c26aa0225bf32.tar.gz | |
Merge 10.3 into 10.4
The MDEV-17062 fix in commit c4195305b2a8431f39a4c75cc1c66ba43685f7a0
was omitted.
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 8b3831f08af..afa692fa139 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2005, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2014, 2019, MariaDB Corporation. +Copyright (c) 2014, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -3535,7 +3535,6 @@ row_merge_insert_index_tuples( double curr_progress = 0; dict_index_t* old_index = NULL; const mrec_t* mrec = NULL; - ulint n_ext = 0; mtr_t mtr; @@ -3601,8 +3600,6 @@ row_merge_insert_index_tuples( row buffer to data tuple record */ row_merge_mtuple_to_dtuple( index, dtuple, &row_buf->tuples[n_rows]); - - n_ext = dtuple_get_n_ext(dtuple); n_rows++; /* BLOB pointers must be copied from dtuple */ mrec = NULL; @@ -3621,7 +3618,7 @@ row_merge_insert_index_tuples( } dtuple = row_rec_to_index_entry_low( - mrec, index, offsets, &n_ext, tuple_heap); + mrec, index, offsets, tuple_heap); } old_index = dict_table_get_first_index(old_table); @@ -3634,10 +3631,7 @@ row_merge_insert_index_tuples( } } - if (!n_ext) { - /* There are no externally stored columns. */ - } else { - ut_ad(dict_index_is_clust(index)); + if (dict_index_is_clust(index) && dtuple_get_n_ext(dtuple)) { /* Off-page columns can be fetched safely when concurrent modifications to the table are disabled. (Purge can process delete-marked |