20 lines
1.2 KiB
Diff
20 lines
1.2 KiB
Diff
|
diff -up mariadb-5.5.29/storage/myisam/myisamchk.c.sortbuffer mariadb-5.5.29/storage/myisam/myisamchk.c
|
||
|
|
--- mariadb-5.5.29/storage/myisam/myisamchk.c.sortbuffer 2013-02-27 16:46:02.258855014 +0100
|
||
|
|
+++ mariadb-5.5.29/storage/myisam/myisamchk.c 2013-02-27 16:46:23.456854430 +0100
|
||
|
|
@@ -294,13 +294,13 @@ static struct my_option my_long_options[
|
||
|
|
{ "sort_buffer_size", OPT_SORT_BUFFER_SIZE,
|
||
|
|
"Deprecated. myisam_sort_buffer_size alias is being used",
|
||
|
|
&check_param.sort_buffer_length,
|
||
|
|
- &check_param.sort_buffer_length, 0, GET_ULL, REQUIRED_ARG,
|
||
|
|
+ &check_param.sort_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
|
||
|
|
(long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD),
|
||
|
|
SIZE_T_MAX, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||
|
|
{ "myisam_sort_buffer_size", OPT_SORT_BUFFER_SIZE,
|
||
|
|
"Alias of sort_buffer_size parameter",
|
||
|
|
&check_param.sort_buffer_length,
|
||
|
|
- &check_param.sort_buffer_length, 0, GET_ULL, REQUIRED_ARG,
|
||
|
|
+ &check_param.sort_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
|
||
|
|
(long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD),
|
||
|
|
SIZE_T_MAX, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||
|
|
{ "sort_key_blocks", OPT_SORT_KEY_BLOCKS, "",
|