diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-17 11:11:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-17 14:27:29 +0200 |
| commit | c3695b4058ea9a8849c22aabeabc76448fe548f8 (patch) | |
| tree | a11fc26c2cf2e9f590c149fd8e328246ab0b469f /storage/innobase/row/row0ftsort.cc | |
| parent | 5838b52743423a2f9cf8d1a80e21c502cd308604 (diff) | |
| download | mariadb-git-c3695b4058ea9a8849c22aabeabc76448fe548f8.tar.gz | |
MDEV-21511: Remove unnecessary code
Now that we will be invoking dtuple_get_n_ext() instead of
letting btr_push_update_extern_fields() update an already
calculated value, it is unnecessary to calculate the n_ext
upfront.
row_rec_to_index_entry(), row_rec_to_index_entry_low():
Remove the output parameter n_ext.
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index 68ac044416f..e3b608769e1 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2010, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2019, MariaDB Corporation. +Copyright (c) 2015, 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 @@ -1720,7 +1720,6 @@ row_fts_merge_insert( corresponding FTS index auxiliary tables */ for (;;) { dtuple_t* dtuple; - ulint n_ext; int min_rec = 0; if (fts_sort_pll_degree <= 2) { @@ -1763,7 +1762,7 @@ row_fts_merge_insert( } dtuple = row_rec_to_index_entry_low( - mrec[min_rec], index, offsets[min_rec], &n_ext, + mrec[min_rec], index, offsets[min_rec], tuple_heap); row_fts_insert_tuple( |