Commit 5abe2fdb authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
parents a4727936 4de01438

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -9052,7 +9052,7 @@ void ndb_serialize_cond(const Item *item, void *arg) 
            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"));

sql/item_func.cc

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ void Item_func::traverse_cond(Cond_traverser traverser, 
      (*traverser)(this, argument);

    }

  }

  else

    (*traverser)(this, argument);

}