diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
| commit | d3935adf7a4ea943583e9e51fe8fa8a2c14521dd (patch) | |
| tree | 4125365a32fa25dde9e79ccfb4dcd10269071607 /storage/myisam/myisamchk.c | |
| parent | 85ea99dcaf8fd91fa566a78062dbfa416c2309fe (diff) | |
| parent | 14ba37f76f87cc48cae62eb6bdf3cda294dff78d (diff) | |
| download | mariadb-git-d3935adf7a4ea943583e9e51fe8fa8a2c14521dd.tar.gz | |
mysql-5.5.29 merge
Diffstat (limited to 'storage/myisam/myisamchk.c')
| -rw-r--r-- | storage/myisam/myisamchk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index e806ca6f8f6..c8546ee56f5 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -291,12 +291,12 @@ static struct my_option my_long_options[] = &check_param.write_buffer_length, 0, GET_ULONG, REQUIRED_ARG, (long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD, INT_MAX32, (long) MALLOC_OVERHEAD, (long) 1L, 0}, - { "sort_buffer_size", OPT_SORT_BUFFER_SIZE, + { "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_ULONG, REQUIRED_ARG, + &check_param.sort_buffer_length, 0, GET_ULL, REQUIRED_ARG, (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD), - ULONG_MAX, (long) MALLOC_OVERHEAD, (long) 1L, 0}, + 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, |