diff options
| author | mskold/marty@mysql.com/linux.site <> | 2006-09-12 16:24:39 +0200 |
|---|---|---|
| committer | mskold/marty@mysql.com/linux.site <> | 2006-09-12 16:24:39 +0200 |
| commit | bf52d20b4b62b42e9d9fbe282dd0ff6153b76171 (patch) | |
| tree | 8d969bab55e394eb098b69422d9aef18ab36d607 /sql/ha_ndbcluster.cc | |
| parent | e38f04a09f3c5fbc261273cb50bbf06434830fa3 (diff) | |
| parent | 4bd1ef6b32229ebdcc2c2d5635963151c0434f38 (diff) | |
| download | mariadb-git-bf52d20b4b62b42e9d9fbe282dd0ff6153b76171.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 9c4a2c20ca0..be884782d6c 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6894,11 +6894,13 @@ void ndb_serialize_cond(const Item *item, void *arg) 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 || @@ -7118,6 +7120,9 @@ void ndb_serialize_cond(const Item *item, void *arg) 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; |