summaryrefslogtreecommitdiff
path: root/sql/opt_sum.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-03-19 13:33:46 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-03-19 13:33:46 +0200
commit93d8f887a0c4fd9b836c433c5cc482a7d64ef725 (patch)
treeda323854000bfa9bc9fceef94b164efa06e5fa88 /sql/opt_sum.cc
parent2944d7e69292999dbc0365cccf03efca4192967c (diff)
parent4e825b0e8ae07e1e847cbbc3c5b7203ae5b96a89 (diff)
downloadmariadb-git-93d8f887a0c4fd9b836c433c5cc482a7d64ef725.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r--sql/opt_sum.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 525d7390a26..a6c56bbea37 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -842,7 +842,10 @@ static bool matching_cond(bool max_fl, TABLE_REF *ref, KEY *keyinfo,
if (is_field_part)
{
if (between || eq_type)
+ {
*range_fl&= ~(NO_MAX_RANGE | NO_MIN_RANGE);
+ *range_fl&= ~(max_fl ? NEAR_MAX : NEAR_MIN);
+ }
else
{
*range_fl&= ~(max_fl ? NO_MAX_RANGE : NO_MIN_RANGE);