diff options
| author | unknown <serg@serg.mysql.com> | 2003-01-21 19:24:34 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-01-21 19:24:34 +0100 |
| commit | 76078f2c8417df4695f14b75fc4711417d1f3c08 (patch) | |
| tree | 2c7d9d1b4d148a8335c0f806f6c7bc3dcab8e3ce /myisam/fulltext.h | |
| parent | e503a5807d12c8f08ae4a791d97f8507eb90bb38 (diff) | |
| download | mariadb-git-76078f2c8417df4695f14b75fc4711417d1f3c08.tar.gz | |
Two-level index structure for FULLTEXT indexes
myisam/ftdefs.h:
intermediate cleanup checkin
myisam/mi_create.c:
intermediate cleanup checkin
myisam/myisamchk.c:
intermediate cleanup checkin
myisam/ft_parser.c:
intermediate cleanup checkin
myisam/ft_update.c:
intermediate cleanup checkin
myisam/mi_update.c:
intermediate cleanup checkin
mysql-test/r/fulltext.result:
stopword test
mysql-test/t/fulltext.test:
stopword test
mysys/mulalloc.c:
function comments clarified
include/my_handler.h:
get_key_length_rdonly utility macro
include/myisam.h:
this kind of hacks bites :)
myisam/ft_dump.c:
bugfix
myisam/mi_open.c:
bugfix
myisam/sort.c:
bugfixing
myisam/mi_rnext.c:
not a solution at all, but a temporary fix to make
mi_rnext to work on ft2 index. (only ft_dump uses mi_rnext
on fulltext indexes for now).
myisam/ft_boolean_search.c:
ft_sintXkorr, ft_intXstore
myisam/ft_nlq_search.c:
ft_sintXkorr, ft_intXstore
myisam/fulltext.h:
ft_sintXkorr, ft_intXstore
myisam/mi_check.c:
ft_sintXkorr, ft_intXstore
myisam/ft_static.c:
two-level tree support in wi_write()
myisam/mi_write.c:
two-level tree support in wi_write()
myisam/myisamdef.h:
two-level tree support in wi_write()
myisam/mi_delete.c:
support for ft2 in mi_delete
mysql-test/r/fulltext2.result:
support for ft2 in mi_delete
mysql-test/t/fulltext2.test:
support for ft2 in mi_delete
Diffstat (limited to 'myisam/fulltext.h')
| -rw-r--r-- | myisam/fulltext.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/myisam/fulltext.h b/myisam/fulltext.h index 39801c1c87e..ec267eb3e86 100644 --- a/myisam/fulltext.h +++ b/myisam/fulltext.h @@ -21,19 +21,16 @@ #include "myisamdef.h" #include "ft_global.h" -/* shoudn't be def'ed when linking with mysql */ -#undef EVAL_RUN - #define HA_FT_WTYPE HA_KEYTYPE_FLOAT #define HA_FT_WLEN 4 -#ifdef EVAL_RUN -#define FT_SEGS 3 -#else /* EVAL_RUN */ #define FT_SEGS 2 -#endif /* EVAL_RUN */ + +#define ft_sintXkorr(A) mi_sint4korr(A) +#define ft_intXstore(T,A) mi_int4store(T,A) extern const HA_KEYSEG ft_keysegs[FT_SEGS]; int _mi_ft_cmp(MI_INFO *, uint, const byte *, const byte *); int _mi_ft_add(MI_INFO *, uint, byte *, const byte *, my_off_t); int _mi_ft_del(MI_INFO *, uint, byte *, const byte *, my_off_t); + |