MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Chad MILLER Date:May 4 2007 9:38pm
Subject:bk commit into 4.1 tree (cmiller:1.2652) BUG#27976
View as plain text  
Below is the list of changes that have just been committed into a local
4.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 17:38:29-04:00, cmiller@stripped +2 -0
  Bug #27976: Misleading error message, 'Sort buffer to small'
  
  The message is gramatically wrong, and factually wrong.
  
  Change it to refer to the myisam_sort_buffer_size variable and change
  "to" to "too".

  myisam/sort.c@stripped, 2007-05-04 17:38:28-04:00, cmiller@stripped +4 -4
    Change error messages to be gramatically correct and to refer to the
    correct variable.

  mysql-test/r/repair.result@stripped, 2007-05-04 17:38:28-04:00, cmiller@stripped +1 -1
    Refer to the correct variable.  Message changed.

# 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/my41-bug27976

--- 1.50/myisam/sort.c	2006-11-10 09:39:30 -05:00
+++ 1.51/myisam/sort.c	2007-05-04 17:38:28 -04:00
@@ -152,7 +152,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;
 	}
       }
@@ -176,7 +176,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 */
@@ -370,7 +370,7 @@ pthread_handler_decl(thr_find_all_keys,a
             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;
         }
       }
@@ -393,7 +393,7 @@ pthread_handler_decl(thr_find_all_keys,a
   }
   if (memavl < MIN_SORT_MEMORY)
   {
-    mi_check_print_error(sort_param->sort_info->param, "Sort buffer too small");
+    mi_check_print_error(sort_param->sort_info->param, "MyISAM sort buffer too small");
     goto err; /* purecov: tested */
   }
 

--- 1.20/mysql-test/r/repair.result	2006-10-19 08:34:37 -04:00
+++ 1.21/mysql-test/r/repair.result	2007-05-04 17:38:28 -04:00
@@ -77,7 +77,7 @@ INSERT INTO t1 VALUES
 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;
Thread
bk commit into 4.1 tree (cmiller:1.2652) BUG#27976Chad MILLER4 May