Backported the test case for bug 43617 fixed by the patch for bug 42580.

Backported the test case for bug 49906 fixed by the patch for LP bug 625841.
Slightly optimized the code of the fix for LP bug 625841.

7 files changed, 287 insertions, 6 deletions

diff --git a/mysql-test/include/icp_tests.inc b/mysql-test/include/icp_tests.inc
index 52f89ec903a..af52e7f30d4 100644
--- a/mysql-test/include/icp_tests.inc
+++ b/mysql-test/include/icp_tests.inc
@@ -87,6 +87,78 @@ SELECT * FROM t1 WHERE c2 <=> NULL ORDER BY c1,c2 LIMIT 2;
 DROP TABLE t1;
 
 --echo #
+--echo # Bug#43617 - Innodb returns wrong results with timestamp's range value 
+--echo #             in IN clause
+--echo # (Note: Fixed by patch for BUG#42580)
+--echo #
+
+CREATE TABLE t1(
+  c1 TIMESTAMP NOT NULL, 
+  c2 TIMESTAMP NULL, 
+  c3 DATE, 
+  c4 DATETIME, 
+  PRIMARY KEY(c1), 
+  UNIQUE INDEX(c2)
+);
+
+INSERT INTO t1 VALUES
+  ('0000-00-00 00:00:00','0000-00-00 00:00:00','2008-01-04','2008-01-05 00:00:00'),
+  ('1971-01-01 00:00:01','1980-01-01 00:00:01','2009-01-01','2009-01-02 00:00:00'),
+  ('1999-01-01 00:00:00','1999-01-01 00:00:00', NULL,        NULL),
+  ('2007-05-23 09:15:28','2007-05-23 09:15:28','2007-05-24','2007-05-24 09:15:28'),
+  ('2007-05-27 00:00:00','2007-05-25 00:00:00','2007-05-26','2007-05-26 00:00:00'),
+  ('2008-01-01 00:00:00', NULL,                '2008-01-02','2008-01-03 00:00:00'),
+  ('2009-01-29 11:11:27','2009-01-29 11:11:27','2009-01-29','2009-01-29 11:11:27'),
+  ('2038-01-09 03:14:07','2038-01-09 03:14:07','2009-01-05','2009-01-06 00:00:00');
+
+--echo
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2;
+
+--echo
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 LIMIT 2;
+
+--echo
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC;
+
+--echo
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC LIMIT 2;
+
+--echo
+DROP TABLE t1;
+
+--echo #
+--echo # BUG#49906: Assertion failed - Field_varstring::val_str in field.cc
+--echo # (Note: Fixed by patch for LP BUG#625841)
+--echo #
+
+CREATE TABLE t1 ( 
+  f1 VARCHAR(1024),
+  f2 VARCHAR(10),
+  INDEX test_idx USING BTREE (f2,f1(5))
+);
+
+INSERT INTO t1 VALUES  ('a','c'), ('b','d');  
+
+SELECT f1
+FROM t1 
+WHERE f2 LIKE 'd' 
+ORDER BY f1;
+
+DROP TABLE t1;
+
+--echo #
 --echo # Bug#40992 - InnoDB: Crash when engine_condition_pushdown is on
 --echo #
 
@@ -102,6 +174,7 @@ SELECT * FROM t WHERE a > 2 FOR UPDATE;
 
 DROP TABLE t;
 
+
 --echo #
 --echo # Bug#35080 - Innodb crash at mem_block_get_len line 72
 --echo #
diff --git a/mysql-test/r/innodb_icp.result b/mysql-test/r/innodb_icp.result
index c3643e62caa..729ad81fa25 100644
--- a/mysql-test/r/innodb_icp.result
+++ b/mysql-test/r/innodb_icp.result
@@ -81,6 +81,75 @@ c1	c2	c3	c4
 
 DROP TABLE t1;
 #
+# Bug#43617 - Innodb returns wrong results with timestamp's range value 
+#             in IN clause
+# (Note: Fixed by patch for BUG#42580)
+#
+CREATE TABLE t1(
+c1 TIMESTAMP NOT NULL, 
+c2 TIMESTAMP NULL, 
+c3 DATE, 
+c4 DATETIME, 
+PRIMARY KEY(c1), 
+UNIQUE INDEX(c2)
+);
+INSERT INTO t1 VALUES
+('0000-00-00 00:00:00','0000-00-00 00:00:00','2008-01-04','2008-01-05 00:00:00'),
+('1971-01-01 00:00:01','1980-01-01 00:00:01','2009-01-01','2009-01-02 00:00:00'),
+('1999-01-01 00:00:00','1999-01-01 00:00:00', NULL,        NULL),
+('2007-05-23 09:15:28','2007-05-23 09:15:28','2007-05-24','2007-05-24 09:15:28'),
+('2007-05-27 00:00:00','2007-05-25 00:00:00','2007-05-26','2007-05-26 00:00:00'),
+('2008-01-01 00:00:00', NULL,                '2008-01-02','2008-01-03 00:00:00'),
+('2009-01-29 11:11:27','2009-01-29 11:11:27','2009-01-29','2009-01-29 11:11:27'),
+('2038-01-09 03:14:07','2038-01-09 03:14:07','2009-01-05','2009-01-06 00:00:00');
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 LIMIT 2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC LIMIT 2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+DROP TABLE t1;
+#
+# BUG#49906: Assertion failed - Field_varstring::val_str in field.cc
+# (Note: Fixed by patch for LP BUG#625841)
+#
+CREATE TABLE t1 ( 
+f1 VARCHAR(1024),
+f2 VARCHAR(10),
+INDEX test_idx USING BTREE (f2,f1(5))
+);
+INSERT INTO t1 VALUES  ('a','c'), ('b','d');
+SELECT f1
+FROM t1 
+WHERE f2 LIKE 'd' 
+ORDER BY f1;
+f1
+b
+DROP TABLE t1;
+#
 # Bug#40992 - InnoDB: Crash when engine_condition_pushdown is on
 #
 CREATE TABLE t (
diff --git a/mysql-test/r/innodb_mrr.result b/mysql-test/r/innodb_mrr.result
index fd61460bd79..d244157b61b 100644
--- a/mysql-test/r/innodb_mrr.result
+++ b/mysql-test/r/innodb_mrr.result
@@ -726,6 +726,7 @@ JA	USA
 DROP TABLE t1,t2;
 #
 # Testcase backport: Bug#43249
+# (Note: Fixed by patch for BUG#42580)
 #
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY KEY(c1), UNIQUE INDEX(c2)) engine=innodb;
 INSERT INTO t1 VALUES('8:29:45',NULL,'2009-02-01');
diff --git a/mysql-test/r/maria_icp.result b/mysql-test/r/maria_icp.result
index 701dd5a4bd5..14a450d13ca 100644
--- a/mysql-test/r/maria_icp.result
+++ b/mysql-test/r/maria_icp.result
@@ -81,6 +81,75 @@ c1	c2	c3	c4
 
 DROP TABLE t1;
 #
+# Bug#43617 - Innodb returns wrong results with timestamp's range value 
+#             in IN clause
+# (Note: Fixed by patch for BUG#42580)
+#
+CREATE TABLE t1(
+c1 TIMESTAMP NOT NULL, 
+c2 TIMESTAMP NULL, 
+c3 DATE, 
+c4 DATETIME, 
+PRIMARY KEY(c1), 
+UNIQUE INDEX(c2)
+);
+INSERT INTO t1 VALUES
+('0000-00-00 00:00:00','0000-00-00 00:00:00','2008-01-04','2008-01-05 00:00:00'),
+('1971-01-01 00:00:01','1980-01-01 00:00:01','2009-01-01','2009-01-02 00:00:00'),
+('1999-01-01 00:00:00','1999-01-01 00:00:00', NULL,        NULL),
+('2007-05-23 09:15:28','2007-05-23 09:15:28','2007-05-24','2007-05-24 09:15:28'),
+('2007-05-27 00:00:00','2007-05-25 00:00:00','2007-05-26','2007-05-26 00:00:00'),
+('2008-01-01 00:00:00', NULL,                '2008-01-02','2008-01-03 00:00:00'),
+('2009-01-29 11:11:27','2009-01-29 11:11:27','2009-01-29','2009-01-29 11:11:27'),
+('2038-01-09 03:14:07','2038-01-09 03:14:07','2009-01-05','2009-01-06 00:00:00');
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 LIMIT 2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC LIMIT 2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+DROP TABLE t1;
+#
+# BUG#49906: Assertion failed - Field_varstring::val_str in field.cc
+# (Note: Fixed by patch for LP BUG#625841)
+#
+CREATE TABLE t1 ( 
+f1 VARCHAR(1024),
+f2 VARCHAR(10),
+INDEX test_idx USING BTREE (f2,f1(5))
+);
+INSERT INTO t1 VALUES  ('a','c'), ('b','d');
+SELECT f1
+FROM t1 
+WHERE f2 LIKE 'd' 
+ORDER BY f1;
+f1
+b
+DROP TABLE t1;
+#
 # Bug#40992 - InnoDB: Crash when engine_condition_pushdown is on
 #
 CREATE TABLE t (
diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result
index 742792ec772..41f0d411be4 100644
--- a/mysql-test/r/myisam_icp.result
+++ b/mysql-test/r/myisam_icp.result
@@ -79,6 +79,75 @@ c1	c2	c3	c4
 
 DROP TABLE t1;
 #
+# Bug#43617 - Innodb returns wrong results with timestamp's range value 
+#             in IN clause
+# (Note: Fixed by patch for BUG#42580)
+#
+CREATE TABLE t1(
+c1 TIMESTAMP NOT NULL, 
+c2 TIMESTAMP NULL, 
+c3 DATE, 
+c4 DATETIME, 
+PRIMARY KEY(c1), 
+UNIQUE INDEX(c2)
+);
+INSERT INTO t1 VALUES
+('0000-00-00 00:00:00','0000-00-00 00:00:00','2008-01-04','2008-01-05 00:00:00'),
+('1971-01-01 00:00:01','1980-01-01 00:00:01','2009-01-01','2009-01-02 00:00:00'),
+('1999-01-01 00:00:00','1999-01-01 00:00:00', NULL,        NULL),
+('2007-05-23 09:15:28','2007-05-23 09:15:28','2007-05-24','2007-05-24 09:15:28'),
+('2007-05-27 00:00:00','2007-05-25 00:00:00','2007-05-26','2007-05-26 00:00:00'),
+('2008-01-01 00:00:00', NULL,                '2008-01-02','2008-01-03 00:00:00'),
+('2009-01-29 11:11:27','2009-01-29 11:11:27','2009-01-29','2009-01-29 11:11:27'),
+('2038-01-09 03:14:07','2038-01-09 03:14:07','2009-01-05','2009-01-06 00:00:00');
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 LIMIT 2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+SELECT * 
+FROM t1 
+WHERE c2 IN ('1971-01-01 00:00:01','2038-01-09 03:14:07') 
+ORDER BY c2 DESC LIMIT 2;
+c1	c2	c3	c4
+2038-01-09 03:14:07	2038-01-09 03:14:07	2009-01-05	2009-01-06 00:00:00
+
+DROP TABLE t1;
+#
+# BUG#49906: Assertion failed - Field_varstring::val_str in field.cc
+# (Note: Fixed by patch for LP BUG#625841)
+#
+CREATE TABLE t1 ( 
+f1 VARCHAR(1024),
+f2 VARCHAR(10),
+INDEX test_idx USING BTREE (f2,f1(5))
+);
+INSERT INTO t1 VALUES  ('a','c'), ('b','d');
+SELECT f1
+FROM t1 
+WHERE f2 LIKE 'd' 
+ORDER BY f1;
+f1
+b
+DROP TABLE t1;
+#
 # Bug#40992 - InnoDB: Crash when engine_condition_pushdown is on
 #
 CREATE TABLE t (
diff --git a/mysql-test/t/innodb_mrr.test b/mysql-test/t/innodb_mrr.test
index 7a3dc9f668e..bb0e9c10d39 100644
--- a/mysql-test/t/innodb_mrr.test
+++ b/mysql-test/t/innodb_mrr.test
@@ -417,6 +417,7 @@ DROP TABLE t1,t2;
 
 --echo #
 --echo # Testcase backport: Bug#43249
+--echo # (Note: Fixed by patch for BUG#42580)
 --echo #
 CREATE TABLE t1(c1 TIME NOT NULL, c2 TIME NULL, c3 DATE, PRIMARY KEY(c1), UNIQUE INDEX(c2)) engine=innodb;
 INSERT INTO t1 VALUES('8:29:45',NULL,'2009-02-01');
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 6e3bf27afcc..b9cda236b0c 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -547,12 +547,11 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
   /* Temporary set for register_used_fields and register_field_in_read_map */
   sort_form->read_set= &sort_form->tmp_set;
   register_used_fields(param);
-  if (select && select->cond)
-    select->cond->walk(&Item::register_field_in_read_map, 1,
-                       (uchar*) sort_form);
-  if (select && select->pre_idx_push_select_cond)
-    select->pre_idx_push_select_cond->walk(&Item::register_field_in_read_map,
-                                           1, (uchar*) sort_form);
+  Item *sort_cond= !select ?  
+                     0 : !select->pre_idx_push_select_cond ? 
+                           select->cond : select->pre_idx_push_select_cond;
+  if (sort_cond)
+    sort_cond->walk(&Item::register_field_in_read_map, 1, (uchar*) sort_form);
   sort_form->column_bitmaps_set(&sort_form->tmp_set, &sort_form->tmp_set, 
                                 &sort_form->tmp_set);