mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
ha_myisam.cc magic removed
ha_myisam.h magic removed
This commit is contained in:
@@ -2,3 +2,4 @@ mwagner@work.mysql.com
|
||||
sasha@mysql.sashanet.com
|
||||
sasha@work.mysql.com
|
||||
tim@cane.mysql.fi
|
||||
serg@donna.mysql.com
|
||||
|
||||
@@ -1136,19 +1136,9 @@ int ha_myisam::ft_read(byte * buf)
|
||||
|
||||
thread_safe_increment(ha_read_next_count,&LOCK_status); // why ?
|
||||
|
||||
if ((error=ft_read_next((FT_DOCLIST *) ft_handler,(char*) buf)))
|
||||
ft_handler=NULL; // Magic here ! See Item_func_match::val()
|
||||
// and ha_myisam::index_init()
|
||||
error=ft_read_next((FT_DOCLIST *) ft_handler,(char*) buf);
|
||||
|
||||
table->status=error ? STATUS_NOT_FOUND: 0;
|
||||
return error;
|
||||
}
|
||||
|
||||
int ha_myisam::index_init(uint idx)
|
||||
{
|
||||
if (idx != active_index)
|
||||
ft_handler=NULL; // Magic here !
|
||||
|
||||
active_index=idx;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ class ha_myisam: public handler
|
||||
int index_first(byte * buf);
|
||||
int index_last(byte * buf);
|
||||
int index_next_same(byte *buf, const byte *key, uint keylen);
|
||||
int index_init(uint idx);
|
||||
int index_end() { ft_handler=NULL; return 0; }
|
||||
int ft_init()
|
||||
{ if(!ft_handler) return 1; ft_reinit_search(ft_handler); return 0; }
|
||||
void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort)
|
||||
|
||||
Reference in New Issue
Block a user