diff options
| author | unknown <serg@serg.mylan> | 2003-10-23 15:21:06 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-23 15:21:06 +0200 |
| commit | aa98f58bae74bc25a557d146b7a1bae80217c342 (patch) | |
| tree | 2ce015b91940f6ae6e70f56ba571010c4c8eb3f0 /myisam/ft_update.c | |
| parent | fd85cc84e4cad1f40e09af35265f47cf57750c49 (diff) | |
| download | mariadb-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 'myisam/ft_update.c')
| -rw-r--r-- | myisam/ft_update.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/ft_update.c b/myisam/ft_update.c index 79892f54002..2dc397e864f 100644 --- a/myisam/ft_update.c +++ b/myisam/ft_update.c @@ -97,7 +97,8 @@ uint _mi_ft_segiterator(register FT_SEG_ITERATOR *ftsi) /* parses a document i.e. calls ft_parse for every keyseg */ -uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record) +uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, + const byte *record, my_bool with_alloc) { FT_SEG_ITERATOR ftsi; DBUG_ENTER("_mi_ft_parse"); @@ -108,7 +109,7 @@ uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record) while (_mi_ft_segiterator(&ftsi)) { if (ftsi.pos) - if (ft_parse(parsed, (byte *)ftsi.pos, ftsi.len)) + if (ft_parse(parsed, (byte *)ftsi.pos, ftsi.len, with_alloc)) DBUG_RETURN(1); } DBUG_RETURN(0); @@ -120,7 +121,7 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *info, uint keynr, const byte *record) DBUG_ENTER("_mi_ft_parserecord"); bzero((char*) &ptree, sizeof(ptree)); - if (_mi_ft_parse(&ptree, info, keynr, record)) + if (_mi_ft_parse(&ptree, info, keynr, record,0)) DBUG_RETURN(NULL); DBUG_RETURN(ft_linearize(&ptree)); |