summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-11-22 17:55:18 +0200
committerunknown <monty@hundin.mysql.fi>2001-11-22 17:55:18 +0200
commit38357b30e6ccf4278807cbd8b91ca14efe3fff15 (patch)
tree5c88c46555c8f2f0d49c779e6347d2d6139a84e0 /sql/item_func.cc
parente673b6dcf8b55ec4457ab554a1c09ccf3c079463 (diff)
downloadmariadb-git-38357b30e6ccf4278807cbd8b91ca14efe3fff15.tar.gz
Fixed fulltext after merge from 3.23.45
First (incomplete) version of transaction and as3ap tests. BitKeeper/etc/ignore: Added sql-bench/test-transactions to the ignore list mysql-test/r/fulltext.result: Update fulltext results after merge sql-bench/Makefile.am: Added transaction test sql-bench/run-all-tests.sh: Added transaction test sql-bench/server-cfg.sh: Added transaction test sql-bench/test-ATIS.sh: Cleanup sql/item_func.cc: Fix bad merge sql/mysqld.cc: Cleanup sql/sql_base.cc: Fix bad merge sql/sql_delete.cc: Cleanup sql/sql_parse.cc: Fix bad merge sql/sql_select.cc: Fix bad merge sql/sql_union.cc: Fix bad merge tools/mysqlmanager.c: C
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 91ec8826f73..86cc3283955 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2164,10 +2164,7 @@ bool Item_func_match::eq(const Item *item) const
double Item_func_match::val()
{
if (ft_handler==NULL)
- init_search(1);
-
- if ((null_value= (ft_handler==NULL)))
- return 0.0;
+ return -1.0;
if (join_key)
{