Commit b11705a2 authored by evgen@moonbone.local's avatar evgen@moonbone.local

Fix bug #9703 "Error 1032 with GROUP BY query and large tables"

Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.
parent 5b74b6fd
...@@ -45,6 +45,8 @@ dlenev@build.mysql.com ...@@ -45,6 +45,8 @@ dlenev@build.mysql.com
dlenev@jabberwock.localdomain dlenev@jabberwock.localdomain
dlenev@mysql.com dlenev@mysql.com
ejonore@mc03.ndb.mysql.com ejonore@mc03.ndb.mysql.com
evgen@moonbone.(none)
evgen@moonbone.local
gbichot@quadita2.mysql.com gbichot@quadita2.mysql.com
gbichot@quadxeon.mysql.com gbichot@quadxeon.mysql.com
georg@beethoven.local georg@beethoven.local
......
...@@ -6891,6 +6891,11 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), ...@@ -6891,6 +6891,11 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
&join->tmp_table_param, &join->tmp_table_param,
error, 0)) error, 0))
DBUG_RETURN(-1); DBUG_RETURN(-1);
/*
If table->file->write_row() was failed because of 'out of memory'
and tmp table succesfully created, reset error.
*/
error=0;
} }
if (join->rollup.state != ROLLUP::STATE_NONE && error <= 0) if (join->rollup.state != ROLLUP::STATE_NONE && error <= 0)
{ {
......
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