summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorserg@serg.mylan <>2006-06-16 09:49:18 +0200
committerserg@serg.mylan <>2006-06-16 09:49:18 +0200
commit16861b2e3b25385520901f98cda4979ca1f2a408 (patch)
tree440eb0d0d0efcf6a5acb66f4393b87be49495181 /sql/item_func.cc
parentccf46315a21c9bb8ed3bdbcc06073f6519adba34 (diff)
downloadmariadb-git-16861b2e3b25385520901f98cda4979ca1f2a408.tar.gz
Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
Don't rely on table->null_row when no index is used - it may be a multi-table search
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 4bdb62c6e7a..eaeacffad9f 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4482,7 +4482,7 @@ double Item_func_match::val_real()
if (ft_handler == NULL)
DBUG_RETURN(-1.0);
- if (table->null_row) /* NULL row from an outer join */
+ if (key != NO_SUCH_KEY && table->null_row) /* NULL row from an outer join */
return 0.0;
if (join_key)