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

into moonbone.local:/usr/src/mysql-4.1

BitKeeper/etc/logging_ok

@@ -45,6 +45,8 @@ dlenev@build.mysql.com
 dlenev@jabberwock.localdomain
 dlenev@mysql.com
 ejonore@mc03.ndb.mysql.com
+evgen@moonbone.(none)
+evgen@moonbone.local
 gbichot@quadita2.mysql.com
 gbichot@quadxeon.mysql.com
 georg@beethoven.local

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