mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release

Browse source 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
This commit is contained in:
unknown 2005-08-01 11:52:07 +02:00
commit 15ea9263b1
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/ndb_condition_pushdown.result
View file

@ -1514,7 +1514,7 @@ select auto from t1 where
'1901-01-01 01:01:01' in(date_time) '1901-01-01 01:01:01' in(date_time)
order by auto; order by auto;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 4 Using where with pushed condition; Using filesort 1 SIMPLE t1 ref medium_index medium_index 3 const 10 Using where with pushed condition; Using filesort
select auto from t1 where select auto from t1 where
"aaaa" in(string) and "aaaa" in(string) and
"aaaa" in(vstring) and "aaaa" in(vstring) and

2
mysql-test/t/disabled.def
View file

@ -11,4 +11,4 @@
############################################################################## ##############################################################################
sp-goto:GOTO is currently is disabled - will be fixed in the future sp-goto:GOTO is currently is disabled - will be fixed in the future
ndb_condition_pushdown:Bug #12021

10
sql/ha_ndbcluster.cc
View file

@ -6353,12 +6353,14 @@ void ndb_serialize_cond(const Item *item, void *arg)
// result type // result type
if (context->expecting(Item::FIELD_ITEM) && if (context->expecting(Item::FIELD_ITEM) &&
(context->expecting_field_result(field->result_type()) || (context->expecting_field_result(field->result_type()) ||
// Date and year can be written as strings // Date and year can be written as string or int
((type == MYSQL_TYPE_TIME || ((type == MYSQL_TYPE_TIME ||
type == MYSQL_TYPE_DATE || type == MYSQL_TYPE_DATE ||
type == MYSQL_TYPE_YEAR || type == MYSQL_TYPE_YEAR ||
type == MYSQL_TYPE_DATETIME) type == MYSQL_TYPE_DATETIME)
? context->expecting_field_result(STRING_RESULT) : true)) && ? (context->expecting_field_result(STRING_RESULT) ||
context->expecting_field_result(INT_RESULT))
: true)) &&
// Bit fields no yet supported in scan filter // Bit fields no yet supported in scan filter
type != MYSQL_TYPE_BIT) type != MYSQL_TYPE_BIT)
{ {
@ -6426,8 +6428,8 @@ void ndb_serialize_cond(const Item *item, void *arg)
} }
else else
{ {
DBUG_PRINT("info", ("Was not expecting field of type %u", DBUG_PRINT("info", ("Was not expecting field of type %u(%u)",
field->result_type())); field->result_type(), type));
context->supported= FALSE; context->supported= FALSE;
} }
} }