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 | 9d764856b54ca0ca81305d4aa8e0cb863a2b2578 (patch) | |
| tree | d4aeee16a56473f27abd8a52c5c0da1d5a57377b /client/mysqlslap.c | |
| parent | 555cbdb7a701971d5c5c6742a19333da728d1183 (diff) | |
| parent | 224ef7ff0c5eef39d20ad2cc5c1ac9835e3ba079 (diff) | |
| download | mariadb-git-9d764856b54ca0ca81305d4aa8e0cb863a2b2578.tar.gz | |
Merge in approved bug-fixes
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index b8515289df5..4cf8c7204ed 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -712,6 +712,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), verbose++; break; case 'p': + if (argument == disabled_my_option) + argument= (char*) ""; // Don't require password if (argument) { char *start= argument; |