diff options
| author | Anirudh Mangipudi <anirudh.mangipudi@oracle.com> | 2012-10-30 19:00:12 +0530 |
|---|---|---|
| committer | Anirudh Mangipudi <anirudh.mangipudi@oracle.com> | 2012-10-30 19:00:12 +0530 |
| commit | a7763496f1826546119aae11f111c88798f4d57e (patch) | |
| tree | 4d79d87bc955d0e6c84b9359d3ea06b6b9d6c9cc /storage/myisam | |
| parent | 055763e0db38d1df332232a61a0b7845c0e16aea (diff) | |
| parent | a034f52e6268c9bc4943d6e0888ebce0ba4564dd (diff) | |
| download | mariadb-git-a7763496f1826546119aae11f111c88798f4d57e.tar.gz | |
BUG#11754894: MYISAMCHK ERROR HAS INCORRECT REFERENCE
TO 'MYISAM_SORT_BUFFER_SIZE'
Merging from 5.1 to 5.5
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 a1ba6737f50..66b6b9c5fae 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -295,7 +295,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_ULL, 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, (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD), |