summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2000-12-05 16:14:52 +0200
committerunknown <monty@narttu.mysql.fi>2000-12-05 16:14:52 +0200
commitd2b7b3becddb8ffd60dccf49551749063bb60cc4 (patch)
tree3778f67cd21c1d02d9d2a51d27cfa481b4bd1677 /sql/sql_select.cc
parent357e91d5db6bd67ad4d2a271f1c294afc0b93df5 (diff)
downloadmariadb-git-d2b7b3becddb8ffd60dccf49551749063bb60cc4.tar.gz
Fix for core dump in DISTINCT
Docs/manual.texi: Changlog mysql-test/chew_on_this/select.res: ***MISSING WEAVE***
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8856d31645c..31fc3f28099 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5218,8 +5218,10 @@ remove_duplicates(JOIN *join, TABLE *entry,List<Item> &fields)
List_iterator<Item> it(fields);
Item *item;
while ((item=it++))
- if (item->tmp_table_field())
+ {
+ if (item->tmp_table_field() && ! item->const_item())
field_count++;
+ }
if (!field_count)
{ // only const items