diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-05-04 19:04:09 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-05-04 19:04:09 -0400 |
| commit | 2b7cad650329bff5021a1083696d06dee30f1b26 (patch) | |
| tree | 0a9f793ee00fb5b1cc95e9a6bbf101e775f4de92 /myisam | |
| parent | b9985ebae88875e81a8e329362c07d5eb1c70b54 (diff) | |
| parent | d64e63b36094aec1fc3c3132716d55322ac97dbf (diff) | |
| download | mariadb-git-2b7cad650329bff5021a1083696d06dee30f1b26.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my41-bug27976
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
mysql-test/r/repair.result:
Auto merged
myisam/sort.c:
Manual merge.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index e4c01ac939d..3cb48b47b2c 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -151,7 +151,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, 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 *info,my_bool no_messages, } 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 *arg) 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 *arg) 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 */ } |