From 2fd11169ab10b8d752afbcc2dd58a15cf4de9c45 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Thu, 15 Jul 2004 17:30:55 +0200
Subject: [PATCH] failing fulltext_order_by.test fixed

---
 myisam/sort.c   | 2 +-
 sql/ha_myisam.h | 1 -
 sql/handler.h   | 1 +
 sql/opt_range.h | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/myisam/sort.c b/myisam/sort.c
index b79a18f0a65..8b0ee51ae4e 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -852,7 +852,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file,
   uchar *strpos;
   BUFFPEK *buffpek,**refpek;
   QUEUE queue;
-  int *killed= killed_ptr(info->sort_info->param);
+  volatile int *killed= killed_ptr(info->sort_info->param);
 
   DBUG_ENTER("merge_buffers");
 
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h
index 6fde84d6f6f..972d6b18e19 100644
--- a/sql/ha_myisam.h
+++ b/sql/ha_myisam.h
@@ -81,7 +81,6 @@ 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_end() { ft_handler=NULL; return 0; }
   int ft_init()
   {
     if (!ft_handler)
diff --git a/sql/handler.h b/sql/handler.h
index 6502ed8f3e9..092ea47ef4d 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -367,6 +367,7 @@ public:
   virtual int read_range_next();
   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)
     { return NULL; }
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 3082e2d8a69..1dc3a1354e7 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -563,7 +563,7 @@ class FT_SELECT: public QUICK_RANGE_SELECT {
 public:
   FT_SELECT(THD *thd, TABLE *table, uint key) :
       QUICK_RANGE_SELECT (thd, table, key, 1) { init(); }
-
+  ~FT_SELECT() { file->ft_end(); }
   int init() { return error=file->ft_init(); }
   int get_next() { return error=file->ft_read(record); }
   int get_type() { return QS_TYPE_FULLTEXT; }