bk commit into 5.0 tree (ramil:1.2183)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2183 06/06/16 16:43:44 ramil@stripped +3 -0
  Merge rkalimullin@stripped:/home/bk/mysql-5.0
  into  mysql.com:/usr/home/ram/work/mysql-5.0

  tests/mysql_client_test.c
    1.186 06/06/16 16:43:36 ramil@stripped +0 -0
    Auto merged

  sql/sql_lex.cc
    1.187 06/06/16 16:43:36 ramil@stripped +0 -0
    Auto merged

  sql/item_func.cc
    1.290 06/06/16 16:43:35 ramil@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0/RESYNC

--- 1.289/sql/item_func.cc	2006-06-16 14:05:44 +05:00
+++ 1.290/sql/item_func.cc	2006-06-16 16:43:35 +05:00
@@ -4512,7 +4512,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)