diff options
| author | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-05 13:11:50 +0100 |
| commit | 4cc04190304fed0f9e7378dfd92d645690631836 (patch) | |
| tree | a07a30ca097bfae53819a79e123ec4c4dd7d751b /myisam/myisamchk.c | |
| parent | 7c3be1ba3900042ba97f966858b54589edfc9800 (diff) | |
| parent | 07de836b44434cbab033d02cc47879275080f65c (diff) | |
| download | mariadb-git-4cc04190304fed0f9e7378dfd92d645690631836.tar.gz | |
Merged 4.1 -> 5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'myisam/myisamchk.c')
| -rw-r--r-- | myisam/myisamchk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index d65fac009f8..3e50e786089 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -322,11 +322,11 @@ static struct my_option my_long_options[] = { "decode_bits", OPT_DECODE_BITS, "", (gptr*) &decode_bits, (gptr*) &decode_bits, 0, GET_UINT, REQUIRED_ARG, 9L, 4L, 17L, 0L, 1L, 0}, { "ft_min_word_len", OPT_FT_MIN_WORD_LEN, "", (gptr*) &ft_min_word_len, - (gptr*) &ft_min_word_len, 0, GET_ULONG, REQUIRED_ARG, 4, 1, HA_FT_MAXLEN, + (gptr*) &ft_min_word_len, 0, GET_ULONG, REQUIRED_ARG, 4, 1, HA_FT_MAXCHARLEN, 0, 1, 0}, { "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_MAXLEN, 10, - HA_FT_MAXLEN, 0, 1, 0}, + (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} }; |