summaryrefslogtreecommitdiff
path: root/sql/opt_ft.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/opt_ft.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/opt_ft.h')
-rw-r--r--sql/opt_ft.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/sql/opt_ft.h b/sql/opt_ft.h
index 1c95a7cfea7..dcbbb8abcec 100644
--- a/sql/opt_ft.h
+++ b/sql/opt_ft.h
@@ -31,16 +31,7 @@ public:
FT_SELECT(TABLE *table, TABLE_REF *tref) :
QUICK_SELECT (table,tref->key,1), ref(tref) {}
- int init()
- {
-#if 0
- if (cp_buffer_from_ref(ref)) // as ft-key doesn't use store_key's
- return -1;
-#endif
- return error=file->ft_init(ref->key,
- ref->key_buff,
- ref->key_length);
- }
+ int init() { return error=file->ft_init(); }
int get_next() { return error=file->ft_read(record); }
};