bk commit into 5.1 tree (mskold:1.2383)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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, 2007-02-09 16:33:52+01:00, mskold@stripped +2 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  MERGE: 1.1810.2386.17

  sql/ha_ndbcluster.cc@stripped, 2007-02-09 16:33:45+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.175.61.11

  sql/item_func.cc@stripped, 2007-02-09 16:33:46+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.270.34.1

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1/RESYNC

--- 1.342/sql/item_func.cc	2007-02-09 16:34:01 +01:00
+++ 1.343/sql/item_func.cc	2007-02-09 16:34:01 +01:00
@@ -232,6 +232,8 @@ void Item_func::traverse_cond(Cond_trave
       (*traverser)(this, argument);
     }
   }
+  else
+    (*traverser)(this, argument);
 }
 
 

--- 1.389/sql/ha_ndbcluster.cc	2007-02-09 16:34:01 +01:00
+++ 1.390/sql/ha_ndbcluster.cc	2007-02-09 16:34:01 +01:00
@@ -8870,7 +8870,7 @@ void ndb_serialize_cond(const Item *item
             Check that the field is part of the table of the handler
             instance and that we expect a field with of this result type.
           */
-          if (context->table == field->table)
+          if (context->table->s == field->table->s)
           {       
             const NDBTAB *tab= (const NDBTAB *) context->ndb_table;
             DBUG_PRINT("info", ("FIELD_ITEM"));