summaryrefslogtreecommitdiff
path: root/include/ft_global.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-10-23 15:21:06 +0200
committerunknown <serg@serg.mylan>2003-10-23 15:21:06 +0200
commitaa98f58bae74bc25a557d146b7a1bae80217c342 (patch)
tree2ce015b91940f6ae6e70f56ba571010c4c8eb3f0 /include/ft_global.h
parentfd85cc84e4cad1f40e09af35265f47cf57750c49 (diff)
downloadmariadb-git-aa98f58bae74bc25a557d146b7a1bae80217c342.tar.gz
query expansion for fulltext search
myisam/ft_boolean_search.c: assert.h and queues.h moved to ftdefs.h myisam/ft_parser.c: ft_parse() with alloc myisam/ft_static.c: api changes, ft_max_word_len_for_sort variable removed myisam/ft_update.c: ft_parse() with alloc myisam/ftdefs.h: variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT api changes, ft_max_word_len_for_sort variable removed ft_parse() with alloc myisam/mi_check.c: variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT myisam/myisamchk.c: ft_max_word_len_for_sort removed mysql-test/r/fulltext.result: query expansion tests mysql-test/r/fulltext_var.result: ft_max_word_len_for_sort removed mysql-test/t/fulltext.test: query expansion tests sql/ha_myisam.h: ft api changes for query expansion sql/mysqld.cc: ft_max_word_len_for_sort removed ft_query_expansion_limit added sql/set_var.cc: ft_max_word_len_for_sort removed ft_query_expansion_limit added sql/sql_yacc.yy: EXPANSION added to keyword: rule
Diffstat (limited to 'include/ft_global.h')
-rw-r--r--include/ft_global.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/ft_global.h b/include/ft_global.h
index afaad59ca50..df6860109e4 100644
--- a/include/ft_global.h
+++ b/include/ft_global.h
@@ -51,18 +51,18 @@ extern const char *ft_precompiled_stopwords[];
extern ulong ft_min_word_len;
extern ulong ft_max_word_len;
-extern ulong ft_max_word_len_for_sort;
+extern ulong ft_query_expansion_limit;
extern const char *ft_boolean_syntax;
int ft_init_stopwords(void);
void ft_free_stopwords(void);
-#define FT_NL 0 /* this MUST be 0, see ft_init_search() */
-#define FT_BOOL 1 /* this MUST be 1, see ft_init_search() */
+#define FT_NL 0
+#define FT_BOOL 1
#define FT_SORTED 2
#define FT_EXPAND 4 /* query expansion */
-FT_INFO *ft_init_search(uint,void *, uint, byte *, uint);
+FT_INFO *ft_init_search(uint,void *, uint, byte *, uint, byte *);
#ifdef __cplusplus
}