summaryrefslogtreecommitdiff
path: root/myisam/myisamchk.c
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-08-10 10:07:59 +0200
committerunknown <serg@serg.mylan>2004-08-10 10:07:59 +0200
commitf9831c0401bdae08e2d102062c543d1a3a3da291 (patch)
tree9cf7e03ddea09c62de8aef1e0d31504195025a4e /myisam/myisamchk.c
parent91f20a16b8322e50ef79461239de06d402055372 (diff)
downloadmariadb-git-f9831c0401bdae08e2d102062c543d1a3a3da291.tar.gz
bad merge fixed - myisamchk support for --ft_stopword_file restored
Diffstat (limited to 'myisam/myisamchk.c')
-rw-r--r--myisam/myisamchk.c4
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}
};