summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--myisam/sort.c8
-rw-r--r--mysql-test/r/repair.result2
2 files changed, 5 insertions, 5 deletions
diff --git a/myisam/sort.c b/myisam/sort.c
index fe9459e572b..b909a16e8e6 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -152,7 +152,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;
}
}
@@ -176,7 +176,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 */
@@ -370,7 +370,7 @@ pthread_handler_decl(thr_find_all_keys,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;
}
}
@@ -393,7 +393,7 @@ pthread_handler_decl(thr_find_all_keys,arg)
}
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 */
}
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
index bf46d19777f..355a8c25434 100644
--- a/mysql-test/r/repair.result
+++ b/mysql-test/r/repair.result
@@ -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;