diff options
author | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
commit | f0b28da6f91cf87804015b5dde4820be040c2de7 (patch) | |
tree | be04186411dc657ef6bbcbe01267d30f2675c914 /myisam/ftdefs.h | |
parent | 3ede8f6289b53345f44aecffd70c7e291f88186b (diff) | |
parent | 544f95c45112993df1d31d3eda859dd5e4efff89 (diff) | |
download | mariadb-git-f0b28da6f91cf87804015b5dde4820be040c2de7.tar.gz |
merge with 4.0
Diffstat (limited to 'myisam/ftdefs.h')
-rw-r--r-- | myisam/ftdefs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h index f829a5f0c3a..22a81ca4f9c 100644 --- a/myisam/ftdefs.h +++ b/myisam/ftdefs.h @@ -95,6 +95,8 @@ extern ulong collstat; #define FTB_RBR (ft_boolean_syntax[6]) #define FTB_NEG (ft_boolean_syntax[7]) #define FTB_TRUNC (ft_boolean_syntax[8]) +#define FTB_LQUOT (ft_boolean_syntax[10]) +#define FTB_RQUOT (ft_boolean_syntax[11]) typedef struct st_ft_word { byte * pos; @@ -111,6 +113,7 @@ typedef struct st_ftb_param { int plusminus; bool pmsign; bool trunc; + byte *quot; } FTB_PARAM; int is_stopword(char *word, uint len); @@ -130,8 +133,9 @@ void _mi_ft_segiterator_init(MI_INFO *, uint, const byte *, FT_SEG_ITERATOR *); void _mi_ft_segiterator_dummy_init(const byte *, uint, FT_SEG_ITERATOR *); uint _mi_ft_segiterator(FT_SEG_ITERATOR *); +void ft_parse_init(TREE *, CHARSET_INFO *); int ft_parse(TREE *, byte *, int); -FT_WORD * ft_linearize(/*MI_INFO *, uint, byte *, */TREE *); +FT_WORD * ft_linearize(TREE *); FT_WORD * _mi_ft_parserecord(MI_INFO *, uint, byte *, const byte *); uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record); |