diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
| commit | 29f0dcb56337a3e352ad7a70dcff6b25bb605325 (patch) | |
| tree | 84935c21dc958724ae7dcbeeca0c0f08986fc430 /client/mysqlslap.c | |
| parent | 915a624cbcb58a10a2cfb2e2e4fd5029191fa86a (diff) | |
| parent | 8a2454f8e9fce648272577fcf8006ae6e6806cf9 (diff) | |
| download | mariadb-git-29f0dcb56337a3e352ad7a70dcff6b25bb605325.tar.gz | |
Merge MySQL->MariaDB
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
newer testsuite). They are expected to go after mergning with the latest
xtradb.
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 69a5969c3b0..d86e1923d15 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -565,8 +565,7 @@ static struct my_option my_long_options[] = REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"csv", OPT_SLAP_CSV, "Generate CSV output to named file or to stdout if no file is named.", - (uchar**) &opt_csv_str, (uchar**) &opt_csv_str, 0, GET_STR, - OPT_ARG, 0, 0, 0, 0, 0, 0}, + NULL, NULL, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, #ifdef DBUG_OFF {"debug", '#', "This is a non-debug version. Catch this and exit.", 0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0}, @@ -712,6 +711,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; @@ -738,6 +739,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), DBUG_PUSH(argument ? argument : default_dbug_option); debug_check_flag= 1; break; + case OPT_SLAP_CSV: + if (!argument) + argument= (char *)"-"; /* use stdout */ + opt_csv_str= argument; + break; #include <sslopt-case.h> case 'V': print_version(); |