From 90f227043b608d17bb1e39ca38955b8fe9f6f72d Mon Sep 17 00:00:00 2001
From: "igor@rurik.mysql.com" <>
Date: Fri, 12 May 2006 18:24:38 -0700
Subject: [PATCH] Fixed bug #19490. The bug that caused server crash manifested
 itself when executing queries referring to a view with GROUP BY an expression
 containing non-constant interval. It happened because
 Item_date_add_interval::eq neglected the fact that the method can be applied
 to an expression of the form     date(col) + interval time_to_sec(col) second
 at the time when col could not be evaluated yet. An attempt to evaluate
 time_to_sec(col) in this method resulted in a crash.

---
 mysql-test/r/view.result | 11 +++++++++++
 mysql-test/t/view.test   | 16 ++++++++++++++++
 sql/item_timefunc.cc     |  9 +++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index a89b6e9b3b1..4baa56070b7 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2649,3 +2649,14 @@ ldt
 2006-01-01 03:00:00
 drop view v1, v2;
 drop table t1;
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, d datetime);
+CREATE VIEW v1 AS
+SELECT id, date(d) + INTERVAL TIME_TO_SEC(d) SECOND AS t, COUNT(*)
+FROM t1 GROUP BY id, t;
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`id` AS `id`,(cast(`t1`.`d` as date) + interval time_to_sec(`t1`.`d`) second) AS `t`,count(0) AS `COUNT(*)` from `t1` group by `t1`.`id`,(cast(`t1`.`d` as date) + interval time_to_sec(`t1`.`d`) second)
+SELECT * FROM v1;
+id	t	COUNT(*)
+DROP VIEW v1;
+DROP TABLE t1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 8f759c2d43e..ea22ada900a 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -2512,3 +2512,19 @@ create view v2 as select convert_tz(dt, 'UTC', 'Europe/Moscow') as ldt from v1;
 select * from v2;
 drop view v1, v2;
 drop table t1;
+
+#
+# Bug #19490: usage of view specified by a query with GROUP BY
+#             an expression containing non-constant interval
+
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, d datetime);
+
+CREATE VIEW v1 AS
+SELECT id, date(d) + INTERVAL TIME_TO_SEC(d) SECOND AS t, COUNT(*)
+  FROM t1 GROUP BY id, t;
+
+SHOW CREATE VIEW v1;
+SELECT * FROM v1;
+
+DROP VIEW v1;
+DROP TABLE t1;
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index e997d4ae70c..72c53272e0c 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2144,8 +2144,13 @@ bool Item_date_add_interval::eq(const Item *item, bool binary_cmp) const
   Item_date_add_interval *other= (Item_date_add_interval*) item;
 
   if ((int_type != other->int_type) ||
-      (!args[0]->eq(other->args[0], binary_cmp)) ||
-      (get_interval_value(args[1], int_type, &val, &interval)))
+      (!args[0]->eq(other->args[0], binary_cmp)))
+    return FALSE;
+
+  if (!args[1]->const_item() || !other->args[1]->const_item())
+    return (args[1]->eq(other->args[1], binary_cmp)); 
+
+  if (get_interval_value(args[1], int_type, &val, &interval))
     return FALSE;
 
   val= other->value;