bk commit into 5.1 tree (svoj:1.2518)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj.  When svoj 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@stripped, 2008-02-14 18:23:58+04:00, svoj@stripped +1 -0
  After merge fix.

  storage/federated/ha_federated.cc@stripped, 2008-02-14 18:23:55+04:00, svoj@stripped +3 -3
    After merge fix.

diff -Nrup a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
--- a/storage/federated/ha_federated.cc	2008-02-14 16:47:43 +04:00
+++ b/storage/federated/ha_federated.cc	2008-02-14 18:23:55 +04:00
@@ -1298,9 +1298,9 @@ bool ha_federated::create_where_from_key
             "IS NULL", flag is set to HA_READ_KEY_EXACT.
           */
           if (emit_key_part_name(&tmp, key_part) ||
-              tmp.append(ranges[i]->flag == HA_READ_KEY_EXACT ?
-                         STRING_WITH_LEN(" IS NULL ") :
-                         STRING_WITH_LEN(" IS NOT NULL ")))
+              (ranges[i]->flag == HA_READ_KEY_EXACT ?
+               tmp.append(STRING_WITH_LEN(" IS NULL ")) :
+               tmp.append(STRING_WITH_LEN(" IS NOT NULL "))))
             goto err;
           /*
             We need to adjust pointer and length to be prepared for next