get rid of ft_search. Now there're two sets of ft_ functions, ft_nlq_* and ft_boolean_*

BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
  Delete: myisam/ft_search.c
include/ft_global.h:
  ft_ --> ft_nlq_
myisam/Makefile.am:
  get rid of ft_search.c
myisam/ft_dump.c:
  ft_ --> ft_nlq_
myisam/ft_eval.c:
  ft_ --> ft_nlq_
myisam/ft_nlq_search.c:
  get rid of ft_search.c
myisam/ft_test1.c:
  ft_ --> ft_nlq_
sql/ha_myisam.cc:
  ft_ --> ft_nlq_
sql/ha_myisam.h:
  ft_ --> ft_nlq_
sql/handler.h:
  cleanup
sql/item_func.cc:
  ft_ --> ft_nlq_
sql/item_func.h:
  ft_ --> ft_nlq_
sql/item_strfunc.h:
  cleanup

1 files changed, 13 insertions, 2 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 293ef17b82d..19f15eaf9b3 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -893,10 +893,21 @@ class Item_func_match_nl :public Item_func_match
 {
 public:
   Item_func_match_nl(List<Item> &a, Item *b): Item_func_match(a,b) {}
-  const char *func_name() const { return "match_NL"; }
+  const char *func_name() const { return "match_nl"; }
+  double val();
+  int ft_handler_init(const byte *query, uint querylen, bool presort)
+       { ft_handler=table->file->ft_init_ext(key, query, querylen, presort); }
+  int ft_handler_close() { ft_nlq_close_search(ft_handler); ft_handler=0; }
+};
+#if 0
+class Item_func_match_bool :public Item_func_match
+{
+public:
+  Item_func_match_nl(List<Item> &a, Item *b): Item_func_match(a,b) {}
+  const char *func_name() const { return "match_bool"; }
   double val();
   int ft_handler_init(const byte *query, uint querylen, bool presort)
        { ft_handler=table->file->ft_init_ext(key, query, querylen, presort); }
   int ft_handler_close() { ft_close_search(ft_handler); ft_handler=0; }
 };
-
+#endif