diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
| commit | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (patch) | |
| tree | 0d1b90c00ead9bf4e429168d00c0ccb123d1e887 /sql/opt_range.cc | |
| parent | 8356fb68c366b7f515f9060d964ee598653756a6 (diff) | |
| parent | 56c9b0bca0576985c31f20b46dcb060a01e81a2b (diff) | |
| download | mariadb-git-ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc.tar.gz | |
Merge 10.6 into 10.7
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 28d98ea5ced..7e58754556b 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; } } @@ -10605,8 +10605,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 { @@ -10620,8 +10619,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; } /* |