Commit 0d92f0c7 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6309
parents 6a0ce3ad 7e06386a

client/mysqlcheck.c

+5 −0
Original line number Diff line number Diff line
@@ -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},

myisam/myisamchk.c

+6 −2
Original line number Diff line number Diff line
@@ -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\