summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2000-11-02 17:36:21 +0100
committerunknown <serg@serg.mysql.com>2000-11-02 17:36:21 +0100
commite735267f69bd02a9f7246d72d07100e6179bc33e (patch)
treec2c98089c936e8e55bca2409f12161c8224087c8 /sql/handler.h
parent2db1639c904630c2ad8369fb2ae808be5395980f (diff)
downloadmariadb-git-e735267f69bd02a9f7246d72d07100e6179bc33e.tar.gz
Ill-minded FULLTEXT impilict initialization hack removed.
From now on FULLTEXT search is initialized expilictly in mysql_select() sql/item_func.cc: FULLTEXT expilict initialization sql/opt_ft.h: FULLTEXT expilict initialization sql/opt_range.h: FULLTEXT expilict initialization sql/ha_myisam.cc: FULLTEXT expilict initialization sql/ha_myisam.h: FULLTEXT expilict initialization sql/handler.h: FULLTEXT expilict initialization sql/item_func.h: FULLTEXT expilict initialization sql/sql_select.cc: FULLTEXT expilict initialization myisam/ft_search.c: FULLTEXT expilict initialization
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h
index b7872ead98a..84c14538f4b 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -222,9 +222,9 @@ public:
virtual int index_first(byte * buf)=0;
virtual int index_last(byte * buf)=0;
virtual int index_next_same(byte *buf, const byte *key, uint keylen);
- virtual int ft_init(uint inx,const byte *key, uint keylen, bool presort=1)
+ virtual int ft_init()
{ return -1; }
- virtual void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort=0)
+ virtual void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort)
{ return (void *)NULL; }
virtual int ft_read(byte *buf) { return -1; }
virtual int rnd_init(bool scan=1)=0;
@@ -257,7 +257,7 @@ public:
virtual int restore(THD* thd, HA_CHECK_OPT* check_opt);
// assumes .frm file must exist, and you must have already called
// generate_table() - it will just copy the data file and run repair
-
+
virtual int dump(THD* thd, int fd = -1) { return ER_DUMP_NOT_IMPLEMENTED; }
virtual void deactivate_non_unique_index(ha_rows rows) {}
virtual bool activate_all_index(THD *thd) {return 0;}