summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-04-29 21:19:39 +0400
committerunknown <evgen@moonbone.local>2005-04-29 21:19:39 +0400
commit27fa1254dcbfd0df2d2b7429956fcc39fc4602cd (patch)
tree11b51d9376ed2e9d6a031d8e7deb7dd7ac887447 /sql
parentcfac923cf5eb8048f8921ca2dd117d19f0be772f (diff)
downloadmariadb-git-27fa1254dcbfd0df2d2b7429956fcc39fc4602cd.tar.gz
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. sql/sql_select.cc: Fix bug #9703 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 36efe26dff9..96958db2cce 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6891,6 +6891,11 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
&join->tmp_table_param,
error, 0))
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)
{