revision-id: 2f6a4e12e213e2f7afe8533b05ff879481091085 (mariadb-10.1.32-83-g2f6a4e12e21) parent(s): 4b89d83ddfa4ee93d5c563a9a5a33b439f1c19ed author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-05-07 18:44:52 +0200 message: fix --- mysql-test/r/sp.result | 11 +++++++++++ mysql-test/t/sp.test | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index ad5bddda035..bc33c08d9d8 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -8242,4 +8242,15 @@ 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 diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 6be6440c551..467d3b5a7d4 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -9767,6 +9767,6 @@ UNION SELECT * FROM INFORMATION_SCHEMA.TABLES JOIN INFORMATION_SCHEMA.PARAMETERS; --enable_result_log DROP FUNCTION f; -DROP TABLE v; +DROP VIEW v; --echo #End of 10.1 tests