Commit b8c37b95 authored by unknown's avatar unknown
Browse files

Removed bug introduced when implementing support for IN and BETWEEN

parent 9f50c2ff

mysql-test/r/ndb_condition_pushdown.result

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/ha_ndbcluster.cc

+0 −6
Original line number Diff line number Diff line
@@ -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): {