summaryrefslogtreecommitdiff
path: root/client/mysqladmin.cc
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-01-24 00:09:23 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-01-24 00:09:23 +0300
commit7b5f5d5c37b0a59a04645007cc44446274666832 (patch)
tree5e503468493119925995d64ea920534747a99d04 /client/mysqladmin.cc
parent12318ab2a3a80b2230de8c7d98060b41a6972e25 (diff)
parented79d2ecbbb6b88d328dd32cba3e53051744e9dc (diff)
downloadmariadb-git-7b5f5d5c37b0a59a04645007cc44446274666832.tar.gz
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
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 a3eee14e0d1..3c10109b573 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);