summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2010-01-21 09:10:05 +0100
committerMagne Mahre <magne.mahre@sun.com>2010-01-21 09:10:05 +0100
commit0482b6ebca43fa168550005ecb7f94e3c0729923 (patch)
tree6398d800fa09267e40efa2878d9e026966142170 /mysys
parentcdcf2ae9f93538f129c69952f565c4243b78059a (diff)
downloadmariadb-git-0482b6ebca43fa168550005ecb7f94e3c0729923.tar.gz
WL#5154 Remove deprecated 4.1 features
Several items said to be deprecated in the 4.1 manual have never been removed. This worklog adds deprecation warnings when these items are used, and warns the user that the items will be removed in MySQL 5.6. A couple of previously deprecation decision have been reversed (see single file comments)
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_getopt.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index e561d74f4d1..fc5662812b0 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -146,6 +146,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=# */
@@ -165,6 +169,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] == '=')
{