database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.11' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-06-17 09:50:22 +02:00
parent 9bf0492b7d 11d1ac7285
commit 89c7e2b9c7
196 changed files with 4543 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/main/backup_lock.test
View File

@@ -328,6 +328,7 @@ select * from t_permanent_aria2;
SET AUTOCOMMIT = 0;
UPDATE t_permanent_innodb SET col1 = 9;
--error ER_LOCK_WAIT_TIMEOUT
UPDATE t_permanent_aria SET col1 = 9;
--error ER_LOCK_WAIT_TIMEOUT
UPDATE t_permanent_myisam SET col1 = 9;