summaryrefslogtreecommitdiff
path: root/mysql-test/t/derived.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-23 20:49:31 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-23 20:49:31 +0200
commitc93405b7153df01362f9869bac7c2e305dd06af9 (patch)
tree8043dec44994d714d28873d30d15e81ef3f040e7 /mysql-test/t/derived.test
parentbe21a113da9748d06739b6522ea898257970b1c5 (diff)
parent8637931f118b53ff6fdadf6006ccdb8dedd6f732 (diff)
downloadmariadb-git-10.0-merge.tar.gz
WIP Merge 5.5 into bb-10.0-vicentiu10.0-merge
Unresolved conflicts: both modified: sql/item_cmpfunc.cc both modified: sql/item_cmpfunc.h both modified: sql/sql_partition.cc both modified: storage/tokudb/CMakeLists.txt
Diffstat (limited to 'mysql-test/t/derived.test')
-rw-r--r--mysql-test/t/derived.test15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test
index ec27035d298..00a88032f72 100644
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@@ -921,4 +921,19 @@ SELECT * FROM v1, t2, v3 WHERE a = c AND b = d;
DROP VIEW v1, v3;
DROP TABLE t1, t2, t3;
+--echo #
+--echo # MDEV-14786: Server crashes in Item_cond::transform on 2nd
+--echo # execution of SP querying from a view
+--echo #
+create table t1 (i int, row_start timestamp(6) not null default now(),
+ row_end timestamp(6) not null default '2030-01-01 0:0:0');
+create view v1 as select i from t1 where i < 5 and (row_end =
+TIMESTAMP'2030-01-01 0:0:0' or row_end is null);
+create procedure pr(x int) select i from v1;
+call pr(1);
+call pr(2);
+drop procedure pr;
+drop view v1;
+drop table t1;
+
--echo # end of 5.5