summaryrefslogtreecommitdiff
path: root/client/mysqladmin.cc
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-02-07 12:21:11 +0100
committerBjorn Munch <Bjorn.Munch@sun.com>2010-02-07 12:21:11 +0100
commit97219cb9ef0edfed4679e92ce55a2f980e784eed (patch)
treeca78a3e123dc747967f743f3b2738940bfad4f1f /client/mysqladmin.cc
parent01c0d46af876746d738338f9c077e4146f5e81fa (diff)
parent88519d1c8f33e183bdea575bf18171c82b7da363 (diff)
downloadmariadb-git-97219cb9ef0edfed4679e92ce55a2f980e784eed.tar.gz
merge from 5.1 main
Diffstat (limited to 'client/mysqladmin.cc')
-rw-r--r--client/mysqladmin.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index 2b93c149523..04e25fcf1ff 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -282,6 +282,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
charsets_dir = argument;
#endif
break;
+ case 'O':
+ WARN_DEPRECATED(VER_CELOSIA, "--set-variable", "--variable-name=value");
+ break;
case OPT_MYSQL_PROTOCOL:
opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
opt->name);