Commit b0df2034 authored by unknown's avatar unknown

failing fulltext_order_by.test fixed


myisam/sort.c:
  warning fixed
sql/ha_myisam.h:
  not necessary
parent a96bb92f
...@@ -852,7 +852,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, ...@@ -852,7 +852,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
uchar *strpos; uchar *strpos;
BUFFPEK *buffpek,**refpek; BUFFPEK *buffpek,**refpek;
QUEUE queue; QUEUE queue;
int *killed= killed_ptr(info->sort_info->param); volatile int *killed= killed_ptr(info->sort_info->param);
DBUG_ENTER("merge_buffers"); DBUG_ENTER("merge_buffers");
......
...@@ -81,7 +81,6 @@ class ha_myisam: public handler ...@@ -81,7 +81,6 @@ class ha_myisam: public handler
int index_first(byte * buf); int index_first(byte * buf);
int index_last(byte * buf); int index_last(byte * buf);
int index_next_same(byte *buf, const byte *key, uint keylen); int index_next_same(byte *buf, const byte *key, uint keylen);
int index_end() { ft_handler=NULL; return 0; }
int ft_init() int ft_init()
{ {
if (!ft_handler) if (!ft_handler)
......
...@@ -367,6 +367,7 @@ public: ...@@ -367,6 +367,7 @@ public:
virtual int read_range_next(); virtual int read_range_next();
int compare_key(key_range *range); int compare_key(key_range *range);
virtual int ft_init() { return HA_ERR_WRONG_COMMAND; } 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, virtual FT_INFO *ft_init_ext(uint flags,uint inx,const byte *key,
uint keylen) uint keylen)
{ return NULL; } { return NULL; }
......
...@@ -563,7 +563,7 @@ class FT_SELECT: public QUICK_RANGE_SELECT { ...@@ -563,7 +563,7 @@ class FT_SELECT: public QUICK_RANGE_SELECT {
public: public:
FT_SELECT(THD *thd, TABLE *table, uint key) : FT_SELECT(THD *thd, TABLE *table, uint key) :
QUICK_RANGE_SELECT (thd, table, key, 1) { init(); } QUICK_RANGE_SELECT (thd, table, key, 1) { init(); }
~FT_SELECT() { file->ft_end(); }
int init() { return error=file->ft_init(); } int init() { return error=file->ft_init(); }
int get_next() { return error=file->ft_read(record); } int get_next() { return error=file->ft_read(record); }
int get_type() { return QS_TYPE_FULLTEXT; } int get_type() { return QS_TYPE_FULLTEXT; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment