diff options
| author | unknown <serg@serg.mysql.com> | 2002-10-14 11:36:48 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-10-14 11:36:48 +0000 |
| commit | 65c4fdc00797b16a56f00d5b0b36b54265868b6f (patch) | |
| tree | 50e53348aa9b2bb4539eb9061d6dbaf5b3bb646f /myisam/ft_static.c | |
| parent | 228bfb05e31363775fac59fdc9ef8e2041183f08 (diff) | |
| parent | db85094bc5386b58ff0b5fa93adab05b12eb9e16 (diff) | |
| download | mariadb-git-65c4fdc00797b16a56f00d5b0b36b54265868b6f.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_update.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'myisam/ft_static.c')
| -rw-r--r-- | myisam/ft_static.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/ft_static.c b/myisam/ft_static.c index e2a4fd8c0b1..5c2629e9e9e 100644 --- a/myisam/ft_static.c +++ b/myisam/ft_static.c @@ -23,7 +23,7 @@ ulong ft_max_word_len=HA_FT_MAXLEN; ulong ft_max_word_len_for_sort=20; const char *ft_boolean_syntax="+ -><()~*:\"\"&|"; -const MI_KEYSEG ft_keysegs[FT_SEGS]={ +const HA_KEYSEG ft_keysegs[FT_SEGS]={ { HA_KEYTYPE_VARTEXT, /* type */ 7, /* language (will be overwritten) */ @@ -36,7 +36,7 @@ const MI_KEYSEG ft_keysegs[FT_SEGS]={ HA_FT_WLEN, /* start */ #endif /* EVAL_RUN */ 0, /* null_pos */ - NULL /* sort_order */ + NULL /* charset */ }, #ifdef EVAL_RUN { |