diff options
| author | jimw@mysql.com <> | 2005-02-04 11:59:02 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-02-04 11:59:02 -0800 |
| commit | 8c8553af81ea65b160354c5c466feff1d1169ad9 (patch) | |
| tree | 51df5e0d0334e67749bc68845ba7a952061390a5 /sql/handler.h | |
| parent | d017a604fe942bd02522bb95b217305000857529 (diff) | |
| parent | bd9239d4d7fcf3ab03f995de533820749aaa204b (diff) | |
| download | mariadb-git-8c8553af81ea65b160354c5c466feff1d1169ad9.tar.gz | |
Merge changes
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index 04f196dccca..8ad49456bf6 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -455,8 +455,7 @@ public: int compare_key(key_range *range); virtual int ft_init() { return HA_ERR_WRONG_COMMAND; } void ft_end() { ft_handler=NULL; } - virtual FT_INFO *ft_init_ext(uint flags,uint inx,const byte *key, - uint keylen) + virtual FT_INFO *ft_init_ext(uint flags, uint inx,String *key) { return NULL; } virtual int ft_read(byte *buf) { return HA_ERR_WRONG_COMMAND; } virtual int rnd_next(byte *buf)=0; |