diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-18 16:56:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-18 16:56:16 +0200 |
| commit | 6373ec3ec74515574f8a08535ed0d090b13d9122 (patch) | |
| tree | d2a7393afdf99b7b609a9c911e16a121c862b403 /storage/innobase/gis/gis0rtree.cc | |
| parent | e709eb9bf712006d070767629518f827cd2f6bed (diff) | |
| parent | d595a91bc6bfb9f9c38bf91738b2a563d80c62e0 (diff) | |
| download | mariadb-git-6373ec3ec74515574f8a08535ed0d090b13d9122.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/gis/gis0rtree.cc')
| -rw-r--r-- | storage/innobase/gis/gis0rtree.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc index 7ba6f59c2d4..5a80d394d77 100644 --- a/storage/innobase/gis/gis0rtree.cc +++ b/storage/innobase/gis/gis0rtree.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2018, 2019, MariaDB Corporation. +Copyright (c) 2018, 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 @@ -1436,10 +1436,9 @@ rtr_page_copy_rec_list_end_no_locks( offsets2 = rec_get_offsets(cur_rec, index, offsets2, is_leaf, ULINT_UNDEFINED, &heap); - cmp = cmp_rec_rec_with_match(cur1_rec, cur_rec, - offsets1, offsets2, - index, FALSE, - &cur_matched_fields); + cmp = cmp_rec_rec(cur1_rec, cur_rec, + offsets1, offsets2, index, false, + &cur_matched_fields); if (cmp < 0) { page_cur_move_to_prev(&page_cur); break; @@ -1551,15 +1550,13 @@ rtr_page_copy_rec_list_start_no_locks( while (!page_rec_is_supremum(cur_rec)) { ulint cur_matched_fields = 0; - int cmp; offsets2 = rec_get_offsets(cur_rec, index, offsets2, is_leaf, ULINT_UNDEFINED, &heap); - cmp = cmp_rec_rec_with_match(cur1_rec, cur_rec, - offsets1, offsets2, - index, FALSE, - &cur_matched_fields); + int cmp = cmp_rec_rec(cur1_rec, cur_rec, + offsets1, offsets2, index, false, + &cur_matched_fields); if (cmp < 0) { page_cur_move_to_prev(&page_cur); cur_rec = page_cur_get_rec(&page_cur); |