From e536c8eca7eb528dfe8cfd5ca96d2772ccca2a86 Mon Sep 17 00:00:00 2001
From: unknown <igor@rurik.mysql.com>
Date: Sat, 8 Apr 2006 11:42:09 -0700
Subject: [PATCH] Fixed bug #16069. The function agg_cmp_type in
 item_cmpfunc.cc neglected the fact that the first argument in a BETWEEN/IN
 predicate could be a field of a view. As a result in the case when the
 retrieved table was hidden by a view over it and the arguments in the
 BETWEEN/IN predicates are of the date/time type the function did not perform
 conversion of the constant arguments to the same format as the first field
 argument. If formats of the arguments differed it caused wrong a evaluation
 of the predicates.

mysql-test/r/view.result:
  Added a test case for bug #16069.
mysql-test/t/view.test:
  Added a test case for bug #16069.
---
 mysql-test/r/view.result | 21 +++++++++++++++++++++
 mysql-test/t/view.test   | 20 ++++++++++++++++++++
 sql/item_cmpfunc.cc      |  4 ++--
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index f0fb35f1a2e..7519b8022f0 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2579,3 +2579,24 @@ COUNT(*)
 2
 DROP VIEW v2;
 DROP TABLE t1, t2;
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY,
+td date DEFAULT NULL, KEY idx(td));
+INSERT INTO t1 VALUES 
+(1, '2005-01-01'), (2, '2005-01-02'), (3, '2005-01-02'),
+(4, '2005-01-03'), (5, '2005-01-04'), (6, '2005-01-05'),
+(7, '2005-01-05'), (8, '2005-01-05'), (9, '2005-01-06');
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT * FROM t1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';
+id	td
+2	2005-01-02
+3	2005-01-02
+4	2005-01-03
+5	2005-01-04
+SELECT * FROM v1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';
+id	td
+2	2005-01-02
+3	2005-01-02
+4	2005-01-03
+5	2005-01-04
+DROP VIEW v1;
+DROP TABLE t1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index afeb0dda729..7ef1f82dbd3 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -2434,3 +2434,23 @@ SELECT COUNT(*) FROM t1 LEFT JOIN v2 ON t1.id=v2.id;
 DROP VIEW v2;
 
 DROP TABLE t1, t2;
+
+#
+# Bug #16069: VIEW does return the same results as underlying SELECT
+#             with WHERE condition containing BETWEEN over dates 
+
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY,
+                 td date DEFAULT NULL, KEY idx(td));
+
+INSERT INTO t1 VALUES 
+ (1, '2005-01-01'), (2, '2005-01-02'), (3, '2005-01-02'),
+ (4, '2005-01-03'), (5, '2005-01-04'), (6, '2005-01-05'),
+ (7, '2005-01-05'), (8, '2005-01-05'), (9, '2005-01-06');
+
+CREATE VIEW v1 AS SELECT * FROM t1;
+
+SELECT * FROM t1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';
+SELECT * FROM v1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';
+
+DROP VIEW v1;
+DROP TABLE t1;
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 24075ac838d..6e1afd4ef09 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -55,8 +55,8 @@ static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems)
   bool all_constant= TRUE;
 
   /* If the first argument is a FIELD_ITEM, pull out the field. */
-  if (items[0]->type() == Item::FIELD_ITEM)
-    field=((Item_field *)items[0])->field;
+  if (items[0]->real_item()->type() == Item::FIELD_ITEM)
+    field=((Item_field *)(items[0]->real_item()))->field;
   /* But if it can't be compared as a longlong, we don't really care. */
   if (field && !field->can_be_compared_as_longlong())
     field= NULL;