database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-02-07 08:51:20 +02:00
parent 8b97eba31b c1eaa385ff
commit 8b6cfda631
69 changed files with 587 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/main/parser.test
View File

@ -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