summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 532a7cedec0..e847b203006 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2299,6 +2299,9 @@ double Item_func_match::val()
if (ft_handler == NULL)
DBUG_RETURN(-1.0);
+ if (table->null_row) /* NULL row from an outer join */
+ return 0.0;
+
if (join_key)
{
if (table->file->ft_handler)