diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-05-12 14:27:19 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-05-12 14:27:19 -0700 |
| commit | 9a84e1e7880e255a3c83fc6394c0e15c3914545f (patch) | |
| tree | d4aeee16a56473f27abd8a52c5c0da1d5a57377b /client/mysqlbinlog.cc | |
| parent | 2121599d38442c2a457ceed7549a98a0532006aa (diff) | |
| parent | 16ef088112e9a5016638d2856c1a2ca469749596 (diff) | |
| download | mariadb-git-9a84e1e7880e255a3c83fc6394c0e15c3914545f.tar.gz | |
Merge in approved bug-fixes
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1864786e3c6..2cf91ec7da5 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -1226,6 +1226,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), one_database = 1; break; case 'p': + if (argument == disabled_my_option) + argument= (char*) ""; // Don't require password if (argument) { my_free(pass,MYF(MY_ALLOW_ZERO_PTR)); |