diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 13:54:04 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 13:54:04 +0100 |
| commit | bd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (patch) | |
| tree | 78117460df06878cb987630a95e6304b587a7f39 /storage/myisam/myisamchk.c | |
| parent | 3c987667d903826e8643f7835f102272ce98987e (diff) | |
| parent | 2e11ca36f28133c18b72351d176ee2fd7fcbc465 (diff) | |
| download | mariadb-git-bd87fed1dc0caa0720e5a60f0fca1b714c58ac75.tar.gz | |
5.1 merge
Diffstat (limited to 'storage/myisam/myisamchk.c')
| -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 6277bd1b7de..f3fc52ebef4 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -310,7 +310,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_ULONG, REQUIRED_ARG, (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD), |