database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Ill-minded FULLTEXT impilict initialization hack removed.

Browse Source 
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
This commit is contained in:
unknown
2000-11-02 17:36:21 +01:00
parent 2db1639c90
commit e735267f69
9 changed files with 44 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/handler.h
View File

@@ -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;}