mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
merge mysql-5.0-bugteam to mysql-5.1-bugteam
This commit is contained in:
@@ -302,17 +302,17 @@ static struct my_option my_long_options[] =
|
||||
(uchar**) &check_param.read_buffer_length,
|
||||
(uchar**) &check_param.read_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
|
||||
(long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD,
|
||||
(long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||||
INT_MAX32, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||||
{ "write_buffer_size", OPT_WRITE_BUFFER_SIZE, "",
|
||||
(uchar**) &check_param.write_buffer_length,
|
||||
(uchar**) &check_param.write_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
|
||||
(long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD,
|
||||
(long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||||
INT_MAX32, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||||
{ "sort_buffer_size", OPT_SORT_BUFFER_SIZE, "",
|
||||
(uchar**) &check_param.sort_buffer_length,
|
||||
(uchar**) &check_param.sort_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
|
||||
(long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD),
|
||||
(long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||||
ULONG_MAX, (long) MALLOC_OVERHEAD, (long) 1L, 0},
|
||||
{ "sort_key_blocks", OPT_SORT_KEY_BLOCKS, "",
|
||||
(uchar**) &check_param.sort_key_blocks,
|
||||
(uchar**) &check_param.sort_key_blocks, 0, GET_ULONG, REQUIRED_ARG,
|
||||
|
||||
Reference in New Issue
Block a user