diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-07-14 10:08:38 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-07-14 10:08:38 -0700 |
| commit | bd0a44fba279633bbbe19c904103ea06644061bb (patch) | |
| tree | 621df211e8838b5cbacf88d7e41019a2401d4f4f /client/mysql_upgrade.c | |
| parent | 5b178e9a2af23226828f9c71fa6b1b82db319a9e (diff) | |
| parent | f8e24020847fe98660c15b03258d3a4f6453d819 (diff) | |
| download | mariadb-git-bd0a44fba279633bbbe19c904103ea06644061bb.tar.gz | |
Merge in bug fixes for client tools
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 641d4a38d16..645fb037647 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -253,8 +253,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; |