diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
commit | 92c8d6f168f329bf7e3998a4f580781d0239b59a (patch) | |
tree | 1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /sql/opt_range.cc | |
parent | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff) | |
parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
download | mariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz |
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r-- | sql/opt_range.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 6825918cb89..9652e839862 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1890,7 +1890,7 @@ SEL_ARG::SEL_ARG(SEL_ARG &arg) :Sql_alloc() next= 0; if (next_key_part) { - ++next_key_part->use_count; + next_key_part->increment_use_count(1); weight += next_key_part->weight; } } @@ -10614,8 +10614,7 @@ key_or(RANGE_OPT_PARAM *param, SEL_ARG *key1,SEL_ARG *key2) Move on to next range in key2 */ key2->increment_use_count(-1); // Free not used tree - key2=key2_next; - continue; + key2= key2_next; } else { @@ -10629,8 +10628,9 @@ key_or(RANGE_OPT_PARAM *param, SEL_ARG *key1,SEL_ARG *key2) tmp: [---------] */ key2->copy_max_to_min(tmp); - continue; + key2= key2_next; } + continue; } /* |