diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-05-22 11:47:09 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-22 11:47:09 +0200 |
commit | 4ec8598c1dcb63499bce998142b8e5b8b09b2d30 (patch) | |
tree | 23010dcb3489b54b4bc9b26481a4a16a4378914a /mysql-test/main/sp.result | |
parent | fe3bf136b6cf83aac5a6e21d3db1c4e821612017 (diff) | |
parent | afe5a51c2df95aa282e4459afeb7f037563def92 (diff) | |
download | mariadb-git-4ec8598c1dcb63499bce998142b8e5b8b09b2d30.tar.gz |
Merge branch 'github/10.2' into 10.3
Diffstat (limited to 'mysql-test/main/sp.result')
-rw-r--r-- | mysql-test/main/sp.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result index f6f34318584..64caf0fd554 100644 --- a/mysql-test/main/sp.result +++ b/mysql-test/main/sp.result @@ -8251,6 +8251,17 @@ DROP PROCEDURE proc_13; DROP PROCEDURE proc_select; DROP TABLE t1, t2; SET max_sp_recursion_depth=default; +# +# MDEV-15347: Valgrind or ASAN errors in mysql_make_view on query +# from information_schema +# +CREATE VIEW v AS SELECT 1; +CREATE FUNCTION f() RETURNS INT RETURN 1; +SELECT * FROM INFORMATION_SCHEMA.TABLES JOIN INFORMATION_SCHEMA.PARAMETERS +UNION +SELECT * FROM INFORMATION_SCHEMA.TABLES JOIN INFORMATION_SCHEMA.PARAMETERS; +DROP FUNCTION f; +DROP VIEW v; #End of 10.1 tests # # MDEV-11081: CURSOR for query with GROUP BY |