diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-05-07 11:03:53 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-05-07 11:03:53 -0400 |
| commit | 98c14490f89fe9f573746144d6ac23da865bb3a5 (patch) | |
| tree | 755d813f3a88decbef2a3aa13924f2190fbbc966 | |
| parent | 881c0aab2337a66df1700c2fe5e09a0c89f4dfd3 (diff) | |
| parent | 5f895fef79a106356eb9e5000763f1cb830bc8c9 (diff) | |
| download | mariadb-git-98c14490f89fe9f573746144d6ac23da865bb3a5.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| -rw-r--r-- | myisam/sort.c | 8 | ||||
| -rw-r--r-- | mysql-test/r/repair.result | 2 |
2 files changed, 5 insertions, 5 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 */ } diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result index 54d53299743..f3b515b013a 100644 --- a/mysql-test/r/repair.result +++ b/mysql-test/r/repair.result @@ -84,7 +84,7 @@ Error 1034 Number of rows changed from 0 to 157 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; |