Commit dfa90af1 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

--use-frm option to mysqlcheck

parent 3f96bc06

client/client_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -37,4 +37,4 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, 
	       OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,

               OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,

               OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,

               OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION };
 
               OPT_PROMPT, OPT_IGN_LINES,OPT_TRANSACTION, OPT_FRM };

client/mysqlcheck.c

+8 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static my_bool opt_alldbs = 0, opt_check_only_changed = 0, opt_extended = 0, 
               opt_compress = 0, opt_databases = 0, opt_fast = 0,

               opt_medium_check = 0, opt_quick = 0, opt_all_in_1 = 0,

               opt_silent = 0, opt_auto_repair = 0, ignore_errors = 0,

               tty_password = 0;

               tty_password = 0, opt_frm = 0;

static uint verbose = 0, opt_mysql_port=0;

static my_string opt_mysql_unix_port = 0;

static char *opt_password = 0, *current_user = 0, *default_charset = 0,
@@ -128,6 +128,10 @@ static struct my_option my_long_options[] = 
  {"user", 'u', "User for login if not current user.", (gptr*) &current_user,

   (gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"use-frm", OPT_FRM,

   "When used with REPAIR, get table structure from .frm file, so the table can be repaired even if .MYI header is corrupted.",

   (gptr*) &opt_frm, (gptr*) &opt_frm, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,

   0},

  {"verbose", 'v', "Print info about the various stages.", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
@@ -452,6 +456,7 @@ static int handle_request_for_tables(char *tables, uint length) 
    op = "REPAIR";

    if (opt_quick)              end = strmov(end, " QUICK");

    if (opt_extended)           end = strmov(end, " EXTENDED");

    if (opt_frm)                end = strmov(end, " USE_FRM");

    break;

  case DO_ANALYZE:

    op = "ANALYZE";