summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
diff options
context:
space:
mode:
authorJim Winstead <jimw@mysql.com>2009-05-07 10:51:55 -0700
committerJim Winstead <jimw@mysql.com>2009-05-07 10:51:55 -0700
commit038be08a1b8f29479e6ff993328692d0875650c2 (patch)
tree200797b66edec0ae022b4848a8d58a51e289216d /client/mysql_upgrade.c
parentb78f9a8659adf3be4ecbad3db59a97deff4f2193 (diff)
downloadmariadb-git-038be08a1b8f29479e6ff993328692d0875650c2.tar.gz
Various command-line utilities, including mysqlbinlog and mysqldump, don't
handle the --skip-password option correctly. (Bug #28479)
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r--client/mysql_upgrade.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index c50f7e03c27..cbc60d8acad 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -231,6 +231,8 @@ get_one_option(int optid, const struct my_option *opt,
break;
case 'p':
+ if (argument == disabled_my_option)
+ argument= (char*) ""; // Don't require password
tty_password= 1;
add_option= FALSE;
if (argument)