diff options
| author | unknown <serg@serg.mysql.com> | 2000-11-28 18:46:07 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-11-28 18:46:07 +0100 |
| commit | c1fdd5b55afab11e981929519b96294cac4f1e04 (patch) | |
| tree | 0968edd40e6ddc5d6f67600003d0fdcfc10afeb9 /myisam | |
| parent | 6fbd5b896bf0d032bb976073168cf4a6112b2bae (diff) | |
| parent | b865c72adb710c9cd5378e4b55eda0ffc9352303 (diff) | |
| download | mariadb-git-c1fdd5b55afab11e981929519b96294cac4f1e04.tar.gz | |
Merge
sql/ha_myisam.cc:
merged
sql/share/russian/errmsg.txt:
merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_search.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/myisam/ft_search.c b/myisam/ft_search.c index 9baab10df1e..4ca1551e809 100644 --- a/myisam/ft_search.c +++ b/myisam/ft_search.c @@ -158,6 +158,7 @@ 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=((MI_INFO *)info)->lastpos; /* black magic ON */ if ((int) (keynr = _mi_check_index((MI_INFO *)info,keynr)) < 0) @@ -204,6 +205,7 @@ err: delete_tree(&aio.dtree); delete_tree(wtree); my_free((char*) wtree,MYF(0)); + ((MI_INFO *)info)->lastpos=saved_lastpos; return dlist; } |