diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
| commit | aca8e7ed6b176f28e8a34ebddc989574d93f305c (patch) | |
| tree | c0d20e5b3e9518f48d789e2220eea46d9010966d /storage/myisam | |
| parent | 750b9147fced7202b541be946e044eb739b20a03 (diff) | |
| parent | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (diff) | |
| download | mariadb-git-aca8e7ed6b176f28e8a34ebddc989574d93f305c.tar.gz | |
5.3 merge
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/myisamchk.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 7d8b577e8b0..e806ca6f8f6 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -291,7 +291,14 @@ 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, + (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD), + ULONG_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, (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD), |