diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2016-06-13 23:32:50 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2016-06-14 19:17:29 +0300 |
| commit | 1bf25092cbf700049b16f556980c84a9674a811f (patch) | |
| tree | 850aab5c3ec95f3fb25585043e83daab408ac355 /storage/myisam | |
| parent | 2b47832a2d261dbaf735b26e796aa126bccafb20 (diff) | |
| download | mariadb-git-1bf25092cbf700049b16f556980c84a9674a811f.tar.gz | |
MDEV-10162: Update repair testcase
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/sort.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index 21f1fa9fd64..e10e4e26112 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -190,7 +190,8 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, } if (memavl < MIN_SORT_BUFFER) { - mi_check_print_error(info->sort_info->param,"MyISAM sort buffer too small"); /* purecov: tested */ + mi_check_print_error(info->sort_info->param, + "MyISAM sort buffer too small"); /* purecov: tested */ my_errno= ENOMEM; /* purecov: tested */ goto err; /* purecov: tested */ } @@ -331,8 +332,6 @@ static my_bool thr_find_all_keys_exec(MI_SORT_PARAM *sort_param) my_bool error= FALSE; if (sort_param->sort_info->got_error) - error= TRUE; - if (error) DBUG_RETURN(error); set_sort_param_read_write(sort_param); @@ -368,9 +367,7 @@ static my_bool thr_find_all_keys_exec(MI_SORT_PARAM *sort_param) keys < (uint) maxbuffer) { mi_check_print_error(sort_param->sort_info->param, - "myisam_sort_buffer_size is too small. Current " - "myisam_sort_buffer_size: %llu rows: %llu sort_length: %u", - sort_param->sortbuff_size, (ulonglong) idx, sort_length); + "myisam_sort_buffer_size is too small"); DBUG_RETURN(TRUE); } } @@ -398,9 +395,7 @@ static my_bool thr_find_all_keys_exec(MI_SORT_PARAM *sort_param) { /* purecov: begin inspected */ mi_check_print_error(sort_param->sort_info->param, - "myisam_sort_buffer_size is too small. Current " - "myisam_sort_buffer_size: %llu rows: %llu sort_length: %u", - sort_param->sortbuff_size, (ulonglong) idx, sort_length); + "myisam_sort_buffer_size is too small"); my_errno= ENOMEM; goto err; /* purecov: end inspected */ |