summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-11-08 09:58:28 +0200
committerunknown <monty@hundin.mysql.fi>2002-11-08 09:58:28 +0200
commit41f55113f4cfb814a3f69d47f26f484f0e6a4799 (patch)
treec3a73f979fd23038b52723c6aca75ef3ea2de64a /sql
parentec2df91657ed9042c706b3d0bd5f5574051ad3f7 (diff)
downloadmariadb-git-41f55113f4cfb814a3f69d47f26f484f0e6a4799.tar.gz
Fixed rare core dump bug when using complicated GROUP BY query that didn't return any results.
This only showed up under heavy load.
Diffstat (limited to 'sql')
-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));
}