diff options
| author | unknown <serg@serg.mysql.com> | 2000-11-02 17:36:21 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-11-02 17:36:21 +0100 |
| commit | e735267f69bd02a9f7246d72d07100e6179bc33e (patch) | |
| tree | c2c98089c936e8e55bca2409f12161c8224087c8 /myisam | |
| parent | 2db1639c904630c2ad8369fb2ae808be5395980f (diff) | |
| download | mariadb-git-e735267f69bd02a9f7246d72d07100e6179bc33e.tar.gz | |
Ill-minded FULLTEXT impilict initialization hack removed.
From now on FULLTEXT search is initialized expilictly in mysql_select()
sql/item_func.cc:
FULLTEXT expilict initialization
sql/opt_ft.h:
FULLTEXT expilict initialization
sql/opt_range.h:
FULLTEXT expilict initialization
sql/ha_myisam.cc:
FULLTEXT expilict initialization
sql/ha_myisam.h:
FULLTEXT expilict initialization
sql/handler.h:
FULLTEXT expilict initialization
sql/item_func.h:
FULLTEXT expilict initialization
sql/sql_select.cc:
FULLTEXT expilict initialization
myisam/ft_search.c:
FULLTEXT expilict initialization
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_search.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/myisam/ft_search.c b/myisam/ft_search.c index 035e149089f..9baab10df1e 100644 --- a/myisam/ft_search.c +++ b/myisam/ft_search.c @@ -158,7 +158,6 @@ FT_DOCLIST * ft_init_search(void *info, uint keynr, byte *key, ALL_IN_ONE aio; FT_DOCLIST *dlist; FT_DOC *dptr; - my_off_t saved_lastpos; /* black magic ON */ if ((int) (keynr = _mi_check_index((MI_INFO *)info,keynr)) < 0) @@ -174,8 +173,6 @@ FT_DOCLIST * ft_init_search(void *info, uint keynr, byte *key, aio.keyinfo=aio.info->s->keyinfo+keynr; aio.key_root=aio.info->s->state.key_root[keynr]; - saved_lastpos=aio.info->lastpos; - if (!(wtree=ft_parse(NULL,key,key_len))) return NULL; init_tree(&aio.dtree,0,sizeof(FT_SUPERDOC),(qsort_cmp)&FT_SUPERDOC_cmp,0, @@ -204,7 +201,6 @@ FT_DOCLIST * ft_init_search(void *info, uint keynr, byte *key, } err: - aio.info->lastpos=saved_lastpos; delete_tree(&aio.dtree); delete_tree(wtree); my_free((char*) wtree,MYF(0)); |