summaryrefslogtreecommitdiff
path: root/mysql-test/main/parser.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-02-07 08:51:20 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-02-07 08:51:20 +0200
commit8b6cfda631253c805687d94f2f1aaa17fd2ef0e2 (patch)
tree9460953eeb7967bc56383bccc8c7af2adf81a694 /mysql-test/main/parser.test
parent8b97eba31ba3b8af6a93b4836b14d52e1c377900 (diff)
parentc1eaa385ffb44bdf6264d2cc4b4cc0e10284c88a (diff)
downloadmariadb-git-8b6cfda631253c805687d94f2f1aaa17fd2ef0e2.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/parser.test')
-rw-r--r--mysql-test/main/parser.test10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test
index 006f409e6b7..7fe870722a2 100644
--- a/mysql-test/main/parser.test
+++ b/mysql-test/main/parser.test
@@ -1565,6 +1565,16 @@ select * from t2;
SET STATEMENT max_statement_time=900 FOR unlock tables;
drop table t1, t2;
+--echo #
+--echo # MDEV-21616: Server crash when using
+--echo # "SET STATEMENT max_statement_time=0 FOR desc xxx" lead to collapse
+--echo #
+
+create table t1 (a int);
+SET STATEMENT max_statement_time=0 FOR desc t1;
+drop table t1;
+SET STATEMENT max_statement_time=0 FOR do 1;
+
--echo # End of 10.4 tests