database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Daniel Black
2022-03-24 18:57:07 +11:00
parent 9c57bbdad0 5ccd845d51
commit e86986a157
48 changed files with 739 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/truncate_notembedded.result
View File

@ -13,7 +13,7 @@ a
UNLOCK TABLES;
connection con1;
TRUNCATE TABLE t1;
ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=8192 option so it cannot execute this statement
ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
disconnect con1;
connection default;
DROP TABLE t1;