Commit f9831c04 authored by unknown's avatar unknown
Browse files

bad merge fixed - myisamchk support for --ft_stopword_file restored

parent 91f20a16

myisam/myisamchk.c

+2 −2
Original line number Diff line number Diff line
@@ -328,11 +328,11 @@ static struct my_option my_long_options[] = 
  { "ft_max_word_len", OPT_FT_MAX_WORD_LEN, "", (gptr*) &ft_max_word_len,

    (gptr*) &ft_max_word_len, 0, GET_ULONG, REQUIRED_ARG, HA_FT_MAXCHARLEN, 10,

    HA_FT_MAXCHARLEN, 0, 1, 0},

  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  { "ft_stopword_file", OPT_FT_STOPWORD_FILE,

    "Use stopwords from this file instead of built-in list.",

    (gptr*) &ft_stopword_file, (gptr*) &ft_stopword_file, 0, GET_STR,

    REQUIRED_ARG, 0, 0, 0, 0, 0, 0}

    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};