From: Date: April 29 2005 7:19pm
Subject: bk commit into 4.1 tree (evgen:1.2203) BUG#9703
List-Archive: http://lists.mysql.com/internals/24487
X-Bug: 9703
Message-Id: <20050429171944.F393019575E@moonbone.local>

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2203 05/04/29 21:19:39 evgen@stripped +2 -0
  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.

  BitKeeper/etc/logging_ok
    1.378 05/04/29 21:19:39 evgen@stripped +2 -0
    Logging to logging@stripped accepted

  sql/sql_select.cc
    1.397 05/04/29 21:17:38 evgen@stripped +5 -0
    Fix bug #9703

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/usr/src/mysql-4.1

--- 1.396/sql/sql_select.cc	2005-04-21 02:08:15 +04:00
+++ 1.397/sql/sql_select.cc	2005-04-29 21:17:38 +04:00
@@ -6891,6 +6891,11 @@
 				      &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)
 	{

--- 1.377/BitKeeper/etc/logging_ok	2005-04-09 00:40:48 +04:00
+++ 1.378/BitKeeper/etc/logging_ok	2005-04-29 21:19:39 +04:00
@@ -45,6 +45,8 @@
 dlenev@stripped
 dlenev@stripped
 ejonore@stripped
+evgen@moonbone.(none)
+evgen@stripped
 gbichot@stripped
 gbichot@stripped
 georg@stripped