diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-24 00:09:23 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-24 00:09:23 +0300 |
| commit | 4a1b59b7ab1e09f23e82ec8274e5d1fa0c067b4f (patch) | |
| tree | 5e503468493119925995d64ea920534747a99d04 /mysys | |
| parent | 83f7a74bd4c5884a3ca082b7d5cc308ffe194ab7 (diff) | |
| parent | 4a10f7b46c9ebbd9af89f37f64df40981459b788 (diff) | |
| download | mariadb-git-4a1b59b7ab1e09f23e82ec8274e5d1fa0c067b4f.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index d24f328cdf0..b91f46df0c4 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -171,6 +171,10 @@ int handle_options(int *argc, char ***argv, { /* --set-variable, or -O */ if (*cur_arg == 'O') { + my_getopt_error_reporter(WARNING_LEVEL, + "%s: Option '-O' is deprecated. " + "Use --variable-name=value instead.", + my_progname); must_be_var= 1; if (!(*++cur_arg)) /* If not -Ovar=# */ @@ -190,6 +194,11 @@ int handle_options(int *argc, char ***argv, } else if (!getopt_compare_strings(cur_arg, "-set-variable", 13)) { + my_getopt_error_reporter(WARNING_LEVEL, + "%s: Option '--set-variable' is deprecated. " + "Use --variable-name=value instead.", + my_progname); + must_be_var= 1; if (cur_arg[13] == '=') { |