bk commit into 5.1 tree (iggy:1.2538)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy 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@stripped, 2007-06-11 15:05:06-04:00, iggy@amd64.(none) +1 -0
  Merge amd64.(none):/src/bug27029/my50-bug27029
  into  amd64.(none):/src/bug27029/my51-bug27029
  MERGE: 1.1810.2978.2

  storage/myisam/sort.c@stripped, 2007-06-11 15:05:02-04:00, iggy@amd64.(none) +0 -0
    Auto merged
    MERGE: 1.45.20.2

  storage/myisam/sort.c@stripped, 2007-06-11 15:05:02-04:00, iggy@amd64.(none) +0 -0
    Merge rename: myisam/sort.c -> storage/myisam/sort.c

# 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:	iggy
# Host:	amd64.(none)
# Root:	/src/bug27029/my51-bug27029/RESYNC

--- 1.45.20.1/myisam/sort.c	2007-06-11 15:03:22 -04:00
+++ 1.68/storage/myisam/sort.c	2007-06-11 15:05:02 -04:00
@@ -461,6 +461,7 @@ err:
     close_cached_file(&sort_param->tempfile_for_exceptions);
 
 ok:
+    free_root(&sort_param->wordroot, MYF(0));
     /*
       Detach from the share if the writer is involved. Avoid others to
       be blocked. This includes a flush of the write buffer. This will
@@ -477,7 +478,6 @@ ok:
     if (!--sort_param->sort_info->threads_running)
       pthread_cond_signal(&sort_param->sort_info->cond);
     pthread_mutex_unlock(&sort_param->sort_info->mutex);
-
     DBUG_PRINT("exit", ("======== ending thread ========"));
   }
   my_thread_end();
@@ -774,7 +774,7 @@ static int NEAR_F merge_many_buff(MI_SOR
     {
       if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
                         buffpek+i,buffpek+i+MERGEBUFF-1))
-        break; /* purecov: inspected */
+        goto cleanup;
     }
     if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++,
                       buffpek+i,buffpek+ *maxbuffer))
@@ -784,6 +784,7 @@ static int NEAR_F merge_many_buff(MI_SOR
     temp=from_file; from_file=to_file; to_file=temp;
     *maxbuffer= (int) (lastbuff-buffpek)-1;
   }
+cleanup:
   close_cached_file(to_file);                   /* This holds old result */
   if (to_file == t_file)
     *t_file=t_file2;                            /* Copy result file */
@@ -899,7 +900,6 @@ merge_buffers(MI_SORT_PARAM *info, uint 
   BUFFPEK *buffpek,**refpek;
   QUEUE queue;
   volatile int *killed= killed_ptr(info->sort_info->param);
-
   DBUG_ENTER("merge_buffers");
 
   count=error=0;