1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into moonbone.local:/usr/src/mysql-4.1
This commit is contained in:
unknown 2005-04-29 22:20:16 +04:00
commit f8e45de365
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BitKeeper/etc/logging_ok
View File

@ -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

5
sql/sql_select.cc
View File

@ -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)
{ {