Commit 99992f6e authored by Igor Babaev's avatar Igor Babaev

Fixed a bug/typo in the patch for mdev-4355, noticed after the patch

had been merged into 5.5.

Corrected the result of the output from the test case for mdev 4895.
parent 5fdb531d
......@@ -354,7 +354,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
SELECT * FROM t1 WHERE concat( dt, '2012-12-21 12:12:12' ) IS NULL;
dt
drop table t1;
DROP TABLE t1;
CREATE TABLE t1 (dt INT NOT NULL);
INSERT INTO t1 VALUES (1),(2);
EXPLAIN
......@@ -363,7 +363,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
SELECT * FROM t1 WHERE concat( dt, '1' ) IS NULL;
dt
drop table t1;
DROP TABLE t1;
CREATE TABLE t1 (dt INT NOT NULL);
INSERT INTO t1 VALUES (1),(2);
EXPLAIN
......@@ -372,4 +372,4 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL);
dt
drop table t1;
DROP TABLE t1;
......@@ -13460,7 +13460,7 @@ remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value)
Propagate the newly formed multiple equalities to
the all AND/OR levels of cond
*/
bool is_simplifiable_cond= true;
bool is_simplifiable_cond= false;
propagate_new_equalities(thd, cond, cond_equalities,
cond_equal->upper_levels,
&is_simplifiable_cond);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment