summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-05-22 21:08:11 +0300
committerunknown <monty@hundin.mysql.fi>2002-05-22 21:08:11 +0300
commit4d6819171d7e8f2ed8a5bea7acc45669f5953b7e (patch)
tree3ed2299d30130662096f4d0e16af306200ba8045 /client/mysqltest.c
parenta5c8c54f569c77052ce06a66578cd920f4b0532e (diff)
parentebb98af7308f9071da9761e17d8610c3c73c5600 (diff)
downloadmariadb-git-4d6819171d7e8f2ed8a5bea7acc45669f5953b7e.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
client/mysqltest.c: Auto merged
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 1fea4f2d302..f2dd19424d1 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -42,7 +42,7 @@
**********************************************************************/
-#define MTEST_VERSION "1.20"
+#define MTEST_VERSION "1.21"
#include <my_global.h>
#include <mysql_embed.h>
@@ -1873,7 +1873,7 @@ void usage()
printf("Runs a test against the mysql server and compares output with a results file.\n\n");
printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
my_print_help(my_long_options);
- printf(" --no-defaults Don't read default options from any options file.\n\n");
+ printf(" --no-defaults Don't read default options from any options file.\n");
my_print_variables(my_long_options);
}