summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-11-08 10:00:40 +0200
committerunknown <monty@hundin.mysql.fi>2002-11-08 10:00:40 +0200
commitde6eea8b6f320ccb59f533476d2056a737311226 (patch)
treecfa6497c6d4376807891a26efd1fdbfa9653f8c8
parentf5e71883bef3d89cb05fa9ab6497dbaed66ad9b0 (diff)
parent41f55113f4cfb814a3f69d47f26f484f0e6a4799 (diff)
downloadmariadb-git-de6eea8b6f320ccb59f533476d2056a737311226.tar.gz
Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23
-rw-r--r--sql/sql_select.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 0c3c19c6e69..3596fdc0c05 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4970,6 +4970,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));
}