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

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

Browse source 
had been merged into 5.5.

Corrected the result of the output from the test case for mdev 4895.
This commit is contained in:
Igor Babaev 2013-08-20 13:47:13 -07:00
parent 5fdb531d77
commit 99992f6ec4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/null.result
View file

@ -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 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; SELECT * FROM t1 WHERE concat( dt, '2012-12-21 12:12:12' ) IS NULL;
dt dt
drop table t1; DROP TABLE t1;
CREATE TABLE t1 (dt INT NOT NULL); CREATE TABLE t1 (dt INT NOT NULL);
INSERT INTO t1 VALUES (1),(2); INSERT INTO t1 VALUES (1),(2);
EXPLAIN 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 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
SELECT * FROM t1 WHERE concat( dt, '1' ) IS NULL; SELECT * FROM t1 WHERE concat( dt, '1' ) IS NULL;
dt dt
drop table t1; DROP TABLE t1;
CREATE TABLE t1 (dt INT NOT NULL); CREATE TABLE t1 (dt INT NOT NULL);
INSERT INTO t1 VALUES (1),(2); INSERT INTO t1 VALUES (1),(2);
EXPLAIN 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 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL); SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL);
dt dt
drop table t1; DROP TABLE t1;

2
sql/sql_select.cc
View file

@ -13460,7 +13460,7 @@ remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value)
Propagate the newly formed multiple equalities to Propagate the newly formed multiple equalities to
the all AND/OR levels of cond the all AND/OR levels of cond
*/ */
bool is_simplifiable_cond= true; bool is_simplifiable_cond= false;
propagate_new_equalities(thd, cond, cond_equalities, propagate_new_equalities(thd, cond, cond_equalities,
cond_equal->upper_levels, cond_equal->upper_levels,
&is_simplifiable_cond); &is_simplifiable_cond);