summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorJim Winstead <jimw@mysql.com>2009-05-19 10:39:03 -0700
committerJim Winstead <jimw@mysql.com>2009-05-19 10:39:03 -0700
commiteb1261502c361df2ae60713785068d45c1689cb2 (patch)
tree3a3e9d846832a812b4e730d6e83de444865a1b78 /client
parent00920ce29b42c7cf6c5e25cd17ec36b0c1a9f15b (diff)
downloadmariadb-git-eb1261502c361df2ae60713785068d45c1689cb2.tar.gz
mysql_upgrade ignored the --basedir and --datadir arguments as it has no use
for them, but it did so silently. (Bug #36558)
Diffstat (limited to 'client')
-rw-r--r--client/mysql_upgrade.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index cbc60d8acad..82bbf440bb4 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -251,8 +251,12 @@ get_one_option(int optid, const struct my_option *opt,
break;
case 'b': /* --basedir */
- case 'v': /* --verbose */
case 'd': /* --datadir */
+ fprintf(stderr, "%s: the '--%s' option is always ignored\n",
+ my_progname, optid == 'b' ? "basedir" : "datadir");
+ /* FALLTHROUGH */
+
+ case 'v': /* --verbose */
case 'f': /* --force */
add_option= FALSE;
break;