diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-08-17 18:02:44 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-08-17 18:02:44 +0300 |
commit | ab3862b814070d8bbfa8a71601d86034488ccd52 (patch) | |
tree | dc059ed266c9bf5d7485e32de2bfd52c7f73d1d4 /mysys | |
parent | 01cb705b758f960901b3c8c66c9c5adaa443247a (diff) | |
download | mariadb-git-ab3862b814070d8bbfa8a71601d86034488ccd52.tar.gz |
Bug #14399795 : ISSUES RELATED TO SETTING AUDIT_LOG_STRATEGY
DURING SERVER STARTUP
The options parser now correctly checks for ambiguous prefixes in
enumerated variables and emits an error when the value supplied is
ambiguous.
No test added since mysql-test-run.pl can't handle server startup
failures as an expected state.
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_getopt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index ac4ae46eab5..2ab9d44893c 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -710,6 +710,11 @@ static int setval(const struct my_option *opts, void *value, char *argument, } *(ulong*)value= arg; } + else if (type < 0) + { + res= EXIT_AMBIGUOUS_OPTION; + goto ret; + } else *(ulong*)value= type - 1; } |