summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2017-11-06 14:35:58 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2017-11-14 08:54:21 +0100
commit0f43279cc472d82859960f5057e0ec98428459ee (patch)
tree9ac83ef278d5b50fc8555c862f42b4c077527951 /mysql-test/r
parent05103c84ecc519eae4090b720f48203a648e2ab9 (diff)
downloadmariadb-git-0f43279cc472d82859960f5057e0ec98428459ee.tar.gz
MDEV-13936: Server crashes in Time_and_counter_tracker::incr_loops
Repeat reworked solution of procedures for all posible Sp (functions & triggers).
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/sp.result12
-rw-r--r--mysql-test/r/trigger.result17
2 files changed, 29 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index c6867d46489..9b0ace5c002 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -8107,4 +8107,16 @@ CALL p();
drop procedure p;
drop view v;
drop table t, tmp_t;
+#
+# MDEV-13936: Server crashes in Time_and_counter_tracker::incr_loops
+#
+CREATE TABLE t1 (i INT);
+CREATE VIEW v1 AS SELECT * FROM t1 WHERE RAND() > 0.5;
+CREATE FUNCTION f1() RETURNS INT RETURN ( SELECT MAX(i) FROM v1 );
+REPLACE INTO v1 VALUES (f1());
+ERROR HY000: The target table v1 of the INSERT is not insertable-into
+SET @aux = f1();
+DROP FUNCTION f1;
+DROP VIEW v1;
+DROP TABLE t1;
#End of 10.1 tests
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 86219875bed..8455450e294 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -2290,3 +2290,20 @@ INSERT INTO t1 VALUES ('a');
ERROR 22001: Data too long for column 'c' at row 1
DROP TRIGGER t1_bi;
DROP TABLE t1;
+#
+# MDEV-13936: Server crashes in Time_and_counter_tracker::incr_loops
+#
+CREATE TABLE t1 (i INT);
+CREATE VIEW v1 AS SELECT * FROM t1 WHERE RAND() > 0.5;
+CREATE TABLE t2 (a int);
+CREATE TABLE t3 (a int);
+create trigger trg after insert on t2 for each row
+INSERT INTO t3 SELECT MAX(i) FROM v1 UNION SELECT MAX(i) FROM v1;
+drop table t1;
+insert into t2 value (2);
+ERROR 42S02: Table 'test.t1' doesn't exist
+CREATE TABLE t1 (i INT);
+insert into t2 value (2);
+DROP VIEW v1;
+DROP TABLE t1,t2,t3;
+End of 10.1 tests.