[Commits] Rev 3680: Fixed a bug/typo in the patch for mdev-4355, noticed after the patch in file:///home/igor/maria/maria-5.3/

Igor Babaev igor at askmonty.org
Tue Aug 20 23:47:13 EEST 2013


At file:///home/igor/maria/maria-5.3/

------------------------------------------------------------
revno: 3680
revision-id: igor at askmonty.org-20130820204713-98acrb6ezfz0fdbm
parent: timour at askmonty.org-20130820140803-vmoet65v3eefklv8
committer: Igor Babaev <igor at askmonty.org>
branch nick: maria-5.3
timestamp: Tue 2013-08-20 13:47:13 -0700
message:
  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.
-------------- next part --------------
=== modified file 'mysql-test/r/null.result'
--- a/mysql-test/r/null.result	2013-08-20 14:08:03 +0000
+++ b/mysql-test/r/null.result	2013-08-20 20:47:13 +0000
@@ -354,22 +354,22 @@
 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;
-CREATE TABLE t1 (dt INT NOT NULL);
-INSERT INTO t1 VALUES (1),(2);
-EXPLAIN
-SELECT * FROM t1 WHERE concat( dt, '1' ) IS NULL;
-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;
-CREATE TABLE t1 (dt INT NOT NULL);
-INSERT INTO t1 VALUES (1),(2);
-EXPLAIN
-SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL);
-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;
+CREATE TABLE t1 (dt INT NOT NULL);
+INSERT INTO t1 VALUES (1),(2);
+EXPLAIN
+SELECT * FROM t1 WHERE concat( dt, '1' ) IS NULL;
+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;
+CREATE TABLE t1 (dt INT NOT NULL);
+INSERT INTO t1 VALUES (1),(2);
+EXPLAIN
+SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL);
+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;

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2013-08-19 21:24:48 +0000
+++ b/sql/sql_select.cc	2013-08-20 20:47:13 +0000
@@ -13460,7 +13460,7 @@
         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);



More information about the commits mailing list