bk commit into 5.0 tree (dkatz:1.2485)

[damien]

Below is the list of changes that have just been committed into a local
5.0 repository of dkatz. When dkatz 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-16 15:47:47-04:00, dkatz@stripped +1 -0
  Merge damien-katzs-computer.local:/Users/dkatz/mysql50
  into  damien-katzs-computer.local:/Users/dkatz/50a
  MERGE: 1.2425.69.1

  myisam/sort.c@stripped, 2007-05-16 15:47:42-04:00, dkatz@stripped +0 -0
    Auto merged
    MERGE: 1.60.1.1

# 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:	dkatz
# Host:	damien-katzs-computer.local
# Root:	/Users/dkatz/50a/RESYNC

--- 1.61/myisam/sort.c	2007-05-01 15:03:45 -04:00
+++ 1.62/myisam/sort.c	2007-05-16 15:47:42 -04:00
@@ -151,7 +151,7 @@ int _create_index_by_sort(MI_SORT_PARAM 
             keys < (uint) maxbuffer)
 	{
 	  mi_check_print_error(info->sort_info->param,
-			       "sort_buffer_size is to small");
+			       "myisam_sort_buffer_size is too small");
 	  goto err;
 	}
       }
@@ -175,7 +175,7 @@ int _create_index_by_sort(MI_SORT_PARAM 
   }
   if (memavl < MIN_SORT_MEMORY)
   {
-    mi_check_print_error(info->sort_info->param,"Sort buffer to small"); /*
purecov: tested */
+    mi_check_print_error(info->sort_info->param,"MyISAM sort buffer too small"); /*
purecov: tested */
     goto err; /* purecov: tested */
   }
   (*info->lock_in_memory)(info->sort_info->param);/* Everything is allocated */
@@ -369,7 +369,7 @@ pthread_handler_t thr_find_all_keys(void
               keys < (uint) maxbuffer)
           {
             mi_check_print_error(sort_param->sort_info->param,
-                                 "sort_buffer_size is to small");
+                                 "myisam_sort_buffer_size is too small");
             goto err;
           }
         }
@@ -397,7 +397,7 @@ pthread_handler_t thr_find_all_keys(void
     if (memavl < MIN_SORT_MEMORY)
     {
       mi_check_print_error(sort_param->sort_info->param,
-                           "Sort buffer too small");
+                           "MyISAM sort buffer too small");
       goto err; /* purecov: tested */
     }