diff options
author | serg@serg.mylan <> | 2004-08-10 10:07:59 +0200 |
---|---|---|
committer | serg@serg.mylan <> | 2004-08-10 10:07:59 +0200 |
commit | 56b423e058c0a791270354e02648239fb5bb590a (patch) | |
tree | 9cf7e03ddea09c62de8aef1e0d31504195025a4e /myisam/myisamchk.c | |
parent | e1e1c39bdade2caabb97bc8e307a8bf6c459105e (diff) | |
download | mariadb-git-56b423e058c0a791270354e02648239fb5bb590a.tar.gz |
bad merge fixed - myisamchk support for --ft_stopword_file restored
Diffstat (limited to 'myisam/myisamchk.c')
-rw-r--r-- | myisam/myisamchk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index c4b5acadc92..2c44953ccc9 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -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} }; |