bk commit into 5.1 tree (cmiller:1.2478)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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-05-04 23:30:29-04:00, cmiller@stripped +2 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976
  MERGE: 1.1810.2869.32

  mysql-test/r/repair.result@stripped, 2007-05-04 23:30:25-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.18.1.5

  storage/myisam/sort.c@stripped, 2007-05-04 23:30:25-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.45.18.2

  storage/myisam/sort.c@stripped, 2007-05-04 23:30:25-04:00, cmiller@stripped +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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/bug27976/my51-bug27976/RESYNC

--- 1.45.18.1/myisam/sort.c	2007-05-04 19:04:07 -04:00
+++ 1.66/storage/myisam/sort.c	2007-05-04 23:30:25 -04:00
@@ -460,6 +460,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
@@ -476,7 +477,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();
@@ -898,7 +898,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;

--- 1.24/mysql-test/r/repair.result	2006-10-19 11:29:10 -04:00
+++ 1.25/mysql-test/r/repair.result	2007-05-04 23:30:25 -04:00
@@ -84,7 +84,7 @@ Error	1034	Number of rows changed from 0
 SET myisam_repair_threads=2;
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
-test.t1	repair	error	sort_buffer_size is to small
+test.t1	repair	error	myisam_sort_buffer_size is too small
 test.t1	repair	warning	Number of rows changed from 0 to 157
 test.t1	repair	status	OK
 SET myisam_repair_threads=@@global.myisam_repair_threads;