mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed bug introduced when implementing support for IN and BETWEEN

Browse source
This commit is contained in:
mskold@mysql.com 2005-06-02 14:46:58 +02:00
parent e8613e53b9
commit cc524b4fda
2 changed files with 1 additions and 7 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

@ -1760,7 +1760,7 @@ id select_type table type possible_keys key key_len ref rows Extra
explain
select * from t2 where (attr1 < 2) = (attr2 < 2) order by pk1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 6 Using where with pushed condition; Using filesort
1 SIMPLE t2 ALL NULL NULL NULL NULL 6 Using where; Using filesort
explain
select * from t3 left join t4 on t4.attr2 = t3.attr2 where t4.attr1 > 1 and t4.attr3 < 5 or t4.attr1 is null order by t4.pk1;
id select_type table type possible_keys key key_len ref rows Extra

6
sql/ha_ndbcluster.cc
View file

@ -6476,7 +6476,6 @@ void ndb_serialize_cond(const Item *item, void *arg)
context->expect_field_result(REAL_RESULT);
context->expect_field_result(INT_RESULT);
context->expect_field_result(DECIMAL_RESULT);
context->expect(Item::FUNC_ITEM);
break;
}
case(Item_func::NE_FUNC): {
@ -6493,7 +6492,6 @@ void ndb_serialize_cond(const Item *item, void *arg)
context->expect_field_result(REAL_RESULT);
context->expect_field_result(INT_RESULT);
context->expect_field_result(DECIMAL_RESULT);
context->expect(Item::FUNC_ITEM);
break;
}
case(Item_func::LT_FUNC): {
@ -6510,7 +6508,6 @@ void ndb_serialize_cond(const Item *item, void *arg)
context->expect_field_result(REAL_RESULT);
context->expect_field_result(INT_RESULT);
context->expect_field_result(DECIMAL_RESULT);
context->expect(Item::FUNC_ITEM);
break;
}
case(Item_func::LE_FUNC): {
@ -6527,7 +6524,6 @@ void ndb_serialize_cond(const Item *item, void *arg)
context->expect_field_result(REAL_RESULT);
context->expect_field_result(INT_RESULT);
context->expect_field_result(DECIMAL_RESULT);
context->expect(Item::FUNC_ITEM);
break;
}
case(Item_func::GE_FUNC): {
@ -6544,7 +6540,6 @@ void ndb_serialize_cond(const Item *item, void *arg)
context->expect_field_result(REAL_RESULT);
context->expect_field_result(INT_RESULT);
context->expect_field_result(DECIMAL_RESULT);
context->expect(Item::FUNC_ITEM);
break;
}
case(Item_func::GT_FUNC): {
@ -6561,7 +6556,6 @@ void ndb_serialize_cond(const Item *item, void *arg)
context->expect_field_result(REAL_RESULT);
context->expect_field_result(INT_RESULT);
context->expect_field_result(DECIMAL_RESULT);
context->expect(Item::FUNC_ITEM);
break;
}
case(Item_func::LIKE_FUNC): {