bk commit into 5.1 tree (mskold:1.2313)

[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, 2006-09-12 16:35:41+02:00, mskold@stripped +1 -0
  Merge mskold@stripped:/home/bk/mysql-5.1
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  MERGE: 1.2302.4.5

  sql/ha_ndbcluster.cc@stripped, 2006-09-12 16:35:34+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.356.1.2

# 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.358/sql/ha_ndbcluster.cc	2006-09-12 16:35:52 +02:00
+++ 1.359/sql/ha_ndbcluster.cc	2006-09-12 16:35:52 +02:00
@@ -8592,11 +8592,13 @@ void ndb_serialize_cond(const Item *item
             DBUG_PRINT("info", ("FIELD_ITEM"));
             DBUG_PRINT("info", ("table %s", tab->getName()));
             DBUG_PRINT("info", ("column %s", field->field_name));
+            DBUG_PRINT("info", ("type %d", field->type()));
             DBUG_PRINT("info", ("result type %d", field->result_type()));
             
             // Check that we are expecting a field and with the correct
             // result type
             if (context->expecting(Item::FIELD_ITEM) &&
+                context->expecting_field_type(field->type()) &&
                 (context->expecting_field_result(field->result_type()) ||
                  // Date and year can be written as string or int
                  ((type == MYSQL_TYPE_TIME ||
@@ -8816,6 +8818,9 @@ void ndb_serialize_cond(const Item *item
                                               func_item);      
             context->expect(Item::STRING_ITEM);
             context->expect(Item::FIELD_ITEM);
+            context->expect_only_field_type(MYSQL_TYPE_STRING);
+            context->expect_field_type(MYSQL_TYPE_VAR_STRING);
+            context->expect_field_type(MYSQL_TYPE_VARCHAR);
             context->expect_field_result(STRING_RESULT);
             context->expect(Item::FUNC_ITEM);
             break;