mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 10:57:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
This commit is contained in:
unknown 2005-06-14 14:25:44 +02:00
commit 692fcc00b0
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/ha_ndbcluster.cc
View file

@ -6399,6 +6399,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
case(REAL_RESULT):
context->expect_only(Item::REAL_ITEM);
context->expect(Item::DECIMAL_ITEM);
context->expect(Item::INT_ITEM);
break;
case(INT_RESULT):
context->expect_only(Item::INT_ITEM);
@ -6407,6 +6408,7 @@ void ndb_serialize_cond(const Item *item, void *arg)
case(DECIMAL_RESULT):
context->expect_only(Item::DECIMAL_ITEM);
context->expect(Item::REAL_ITEM);
context->expect(Item::INT_ITEM);
break;
default:
break;
@ -6809,6 +6811,8 @@ void ndb_serialize_cond(const Item *item, void *arg)
// We have not seen the field argument yet
context->expect_only(Item::FIELD_ITEM);
context->expect_only_field_result(INT_RESULT);
context->expect_field_result(REAL_RESULT);
context->expect_field_result(DECIMAL_RESULT);
}
else
{