diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-10 17:17:08 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-10 17:17:08 +0200 |
| commit | 30606c38ca83e652def62f0093bbcb673ce338b7 (patch) | |
| tree | be3b21ae27931722fdfcb030c1c76fceac3b4dd3 | |
| parent | 4d324e03798c8aa45a818b509795742e56934dad (diff) | |
| parent | da43360e1fb78faee98d45bc07a5b1437264da31 (diff) | |
| download | mariadb-git-30606c38ca83e652def62f0093bbcb673ce338b7.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
| -rw-r--r-- | client/mysqltest.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index fd90112ad6f..258473194ca 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -85,7 +85,7 @@ enum { OPT_SSL_CA, OPT_SSL_CAPATH, OPT_SSL_CIPHER, OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL, OPT_SSL_VERIFY_SERVER_CERT, OPT_MAX_CONNECT_RETRIES, - OPT_MARK_PROGRESS, OPT_CHARSETS_DIR + OPT_MARK_PROGRESS, OPT_CHARSETS_DIR, OPT_LOG_DIR }; static int record= 0, opt_sleep= -1; @@ -855,6 +855,7 @@ void die(const char *fmt, ...) */ if (dying) cleanup_and_exit(1); + dying= 1; /* Print the error message */ fprintf(stderr, "mysqltest: "); @@ -4264,7 +4265,7 @@ static struct my_option my_long_options[] = GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"include", 'i', "Include SQL before each test case.", (gptr*) &opt_include, (gptr*) &opt_include, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"logdir", 0, "Directory for log files", (gptr*) &opt_logdir, + {"logdir", OPT_LOG_DIR, "Directory for log files", (gptr*) &opt_logdir, (gptr*) &opt_logdir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"mark-progress", OPT_MARK_PROGRESS, "Write linenumber and elapsed time to <testname>.progress ", @@ -6199,7 +6200,7 @@ int main(int argc, char **argv) } /* Check for special property for this query */ - display_result_vertically= (command->type == Q_QUERY_VERTICAL); + display_result_vertically|= (command->type == Q_QUERY_VERTICAL); display_result_sorted= (command->type == Q_QUERY_SORTED); if (save_file[0]) |