diff options
| author | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-09 03:55:26 +0200 |
| commit | f8e660d88ca64d2f7a1be58acbe57d777d20b122 (patch) | |
| tree | af09adc5a3ec6814545553d72fda1d33e443d162 /client/mysqltest.c | |
| parent | a10178493005b3fa69163ef39c6a58fe9ff6658b (diff) | |
| parent | 2ea43f3c53573a6482ea84556e11e5db6cedddef (diff) | |
| download | mariadb-git-f8e660d88ca64d2f7a1be58acbe57d777d20b122.tar.gz | |
merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index ed95efc282e..f3037fcc173 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -42,7 +42,7 @@ **********************************************************************/ -#define MTEST_VERSION "1.25" +#define MTEST_VERSION "1.26" #include <my_global.h> #include <mysql_embed.h> @@ -1809,10 +1809,8 @@ int read_query(struct st_query** q_ptr) static struct my_option my_long_options[] = { -#ifndef DBUG_OFF {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, -#endif {"database", 'D', "Database to use.", (gptr*) &db, (gptr*) &db, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"basedir", 'b', "Basedir for tests", (gptr*) &opt_basedir, @@ -1905,7 +1903,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), { switch(optid) { case '#': +#ifndef DBUG_OFF DBUG_PUSH(argument ? argument : "d:t:S:i:O,/tmp/mysqltest.trace"); +#endif break; case 'r': record = 1; @@ -1983,7 +1983,7 @@ int parse_args(int argc, char **argv) default_argv= argv; if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) - exit(ho_error); + exit(1); if (argc > 1) { |