Commit 402e8e5c authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Fix for core dump in DISTINCT

parent a2fc71d3
...@@ -39222,6 +39222,9 @@ though, so Version 3.23 is not released as a stable version yet. ...@@ -39222,6 +39222,9 @@ though, so Version 3.23 is not released as a stable version yet.
@appendixsubsec Changes in release 3.23.29 @appendixsubsec Changes in release 3.23.29
@itemize @bullet @itemize @bullet
@item @item
Fixed bug when doing a @code{SELECT DISTINCT ... table1 LEFT JOIN
table2..] when table2 was empty.
@item
Added @code{--abort-slave-event-count} and Added @code{--abort-slave-event-count} and
@code{--disconnect-slave-event-count} options to @code{mysqld} for @code{--disconnect-slave-event-count} options to @code{mysqld} for
debugging and testing of replication debugging and testing of replication
...@@ -5218,8 +5218,10 @@ remove_duplicates(JOIN *join, TABLE *entry,List<Item> &fields) ...@@ -5218,8 +5218,10 @@ remove_duplicates(JOIN *join, TABLE *entry,List<Item> &fields)
List_iterator<Item> it(fields); List_iterator<Item> it(fields);
Item *item; Item *item;
while ((item=it++)) while ((item=it++))
if (item->tmp_table_field()) {
if (item->tmp_table_field() && ! item->const_item())
field_count++; field_count++;
}
if (!field_count) if (!field_count)
{ // only const items { // only const items
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment