diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-11-02 13:14:07 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-11-02 13:14:07 +0400 |
| commit | 7e06386ae1c28079a047fb132397b1e4c0499a41 (patch) | |
| tree | de731ef781f1890b2cd0c5b333efd6ddc528c44d | |
| parent | 46aa022aa6cf40801518d1be2c9e8e7ffcee9928 (diff) | |
| download | mariadb-git-7e06386ae1c28079a047fb132397b1e4c0499a41.tar.gz | |
A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa
bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).
client/mysqlcheck.c:
A fix (bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).
myisam/myisamchk.c:
A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa).
| -rw-r--r-- | client/mysqlcheck.c | 5 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 8182b95fb83..c670b84db44 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -81,8 +81,13 @@ static struct my_option my_long_options[] = "To check several databases. Note the difference in usage; In this case no tables are given. All name arguments are regarded as databasenames.", (gptr*) &opt_databases, (gptr*) &opt_databases, 0, GET_BOOL, NO_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}, +#else {"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 {"default-character-set", OPT_DEFAULT_CHARSET, "Set the default character set.", (gptr*) &default_charset, (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 648e29e1e9e..c89abca9cad 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -354,8 +354,12 @@ static void usage(void) puts("Description, check and repair of MyISAM tables."); puts("Used without options all tables on the command will be checked for errors"); printf("Usage: %s [OPTIONS] tables[.MYI]\n", my_progname_short); - printf("\nGlobal options:\n\ - -#, --debug=... Output debug log. Often this is 'd:t:o,filename'.\n\ + printf("\nGlobal options:\n"); +#ifndef DBUG_OFF + printf("\ + -#, --debug=... Output debug log. Often this is 'd:t:o,filename'.\n"); +#endif + printf("\ -?, --help Display this help and exit.\n\ -O, --set-variable var=option.\n\ Change the value of a variable. Please note that\n\ |