summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2006-08-15 21:48:07 +0400
committerunknown <evgen@moonbone.local>2006-08-15 21:48:07 +0400
commit03a5e2e76acd09510e6d95f3b5457ec3bbd6fe79 (patch)
tree0b02f16c2645feb85400f703bad2bacbbd158e6d /mysql-test
parent85ac350cf489cbcc405b52e6e17e22a4dd74f92b (diff)
parentc2ef98ad4c81a84bba7f36405f5d6f2384213aa9 (diff)
downloadmariadb-git-03a5e2e76acd09510e6d95f3b5457ec3bbd6fe79.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/15950-bug-5.0-opt-mysql
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/view.result7
-rw-r--r--mysql-test/t/view.test9
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 534065a33b6..5d217755abd 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2850,3 +2850,10 @@ Tables_in_test
t1
DROP TABLE t1;
DROP VIEW IF EXISTS v1;
+create table t1 (f1 datetime);
+create view v1 as select * from t1 where f1 between now() and now() + interval 1 minute;
+show create view v1;
+View Create View
+v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` where (`t1`.`f1` between now() and (now() + interval 1 minute))
+drop view v1;
+drop table t1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 5cb85ca6c9b..315a61f2003 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -2718,3 +2718,12 @@ DROP TABLE t1;
--disable_warnings
DROP VIEW IF EXISTS v1;
--enable_warnings
+
+#
+# Bug #15950: NOW() optimized away in VIEWs
+#
+create table t1 (f1 datetime);
+create view v1 as select * from t1 where f1 between now() and now() + interval 1 minute;
+show create view v1;
+drop view v1;
+drop table t1;