summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2022-01-13 15:53:44 +0300
committerSergei Petrunia <psergey@askmonty.org>2022-01-13 15:53:44 +0300
commitbbc410622680ac2dbb543104b67c2cecbc5782a1 (patch)
treeba3ff93c0b171f4256ae064339e8cc77a44d9d0c /sql/sql_select.cc
parent6831b3f2a0fd656fb41dd9df5f141431988448f1 (diff)
downloadmariadb-git-bb-10.5-mdev27382.tar.gz
MDEV-27382: OFFSET is ignored when combined with DISTINCTbb-10.5-mdev27382
A query in form SELECT DISTINCT expr_that_is_inferred_to_be_const LIMIT 0 OFFSET n produces one row when it should produce none. The issue was in JOIN_TAB::remove_duplicates() in the piece of logic that tried to avoid duplicate removal for such cases but didn't account for possible "LIMIT 0". Fixed in two places: - Make JOIN::optimize_inner be able to infer "Zero limit" for "LIMIT 0 OFFSET some_non_zero_value" (in addition to just "LIMIT 0") - Make JOIN_TAB::remove_duplicates not apply its optimization for cases with non-zero OFFSET clause.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc20
1 files changed, 16 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index cb391314603..66879a39e95 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2149,11 +2149,14 @@ JOIN::optimize_inner()
if (sel->having != having && having_value == Item::COND_OK)
thd->change_item_tree(&sel->having, having);
}
+ bool zero_limit= !unit->lim.get_select_limit() ||
+ (unit->lim.get_select_limit() ==
+ unit->lim.get_offset_limit());
+
if (cond_value == Item::COND_FALSE || having_value == Item::COND_FALSE ||
- (!unit->lim.get_select_limit() &&
- !(select_options & OPTION_FOUND_ROWS)))
+ (zero_limit && !(select_options & OPTION_FOUND_ROWS)))
{ /* Impossible cond */
- if (unit->lim.get_select_limit())
+ if (!zero_limit)
{
DBUG_PRINT("info", (having_value == Item::COND_FALSE ?
"Impossible HAVING" : "Impossible WHERE"));
@@ -24304,7 +24307,16 @@ JOIN_TAB::remove_duplicates()
field_count++;
}
- if (!field_count && !(join->select_options & OPTION_FOUND_ROWS) && !having)
+ /*
+ If the select list does not have any non-constant items, then all rows
+ are identical. Adjust the LIMIT to just produce the first row.
+ Exceptions to this are:
+ - SQL_CALC_FOUND_ROWS
+ - when HAVING caluse is present (we'll need to check it)
+ - when there's a non-zero OFFSET clause
+ */
+ if (!field_count && !(join->select_options & OPTION_FOUND_ROWS) && !having &&
+ !join->unit->lim.get_offset_limit())
{ // only const items with no OPTION_FOUND_ROWS
join->unit->lim.set_single_row(); // Only send first row
DBUG_RETURN(false);