diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result
index 647b943df1e..e62ba68c8f6 100644
--- a/mysql-test/r/null.result
+++ b/mysql-test/r/null.result
@@ -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;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 09f57e395fc..6b4fc70a353 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -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);