summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <igor@olga.mysql.com>2007-01-22 14:23:53 -0800
committerunknown <igor@olga.mysql.com>2007-01-22 14:23:53 -0800
commit6d04643ab3b8ed31a693ac1df6dadc7da42c53b8 (patch)
tree500afccb281a0851b8b9c0ef56f7a51cd021b258 /sql/item_func.cc
parentb9dc0243a822df6484f91f15aa1734b84396ba7d (diff)
downloadmariadb-git-6d04643ab3b8ed31a693ac1df6dadc7da42c53b8.tar.gz
Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches.
The bug is actually a duplicate of the bug 14708. Down-ported the fix for 14708 from 5.0. Merged the test case for bug 14708 from 5.0. mysql-test/r/fulltext_left_join.result: Added a test case for bug #25637 (duplicate .of bug 14708). Merged the test case for bug 14708 from 5.0. mysql-test/t/fulltext_left_join.test: Added a test case for bug #25637 (duplicate of bug 14708). Merged the test case for bug 14708 from 5.0. sql/item_func.cc: Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches. The bug is actually a duplicate of the bug 14708. Down-ported the fix for 14708 from 5.0.
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 635c6b4c6d6..461998477b5 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3247,7 +3247,7 @@ double Item_func_match::val()
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)