Merge from 3.23 to get fix for GROUP BY bug

0f14b3c2 · monty@hundin.mysql.fi · 771f5502 · 5d2f8e96 · 0f14b3c2
Commit 0f14b3c2 authored Nov 08, 2002 by monty@hundin.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/sql_select.cc sql/sql_select.cc +2 -0

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5415,6 +5415,8 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
    }
    else
    {
+      if (end_of_records)
+	DBUG_RETURN(0);
      join->first_record=1;
      VOID(test_if_group_changed(join->group_fields));
    }