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 branch 'bb-10.5-all-builders' into bb-10.6-all-builders

Browse Source
This commit is contained in:
Lena Startseva
2022-09-27 13:17:59 +07:00
parent 789f55c947 2abf499c76
commit f8f25b472e
309 changed files with 2112 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/main/partition_innodb_plugin.test
View File

@ -100,6 +100,8 @@ SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
#
# Bug#32430 - show engine innodb status causes errors
#
#change to "disable_service_connection" after fix MDEV-29278
--disable_view_protocol
SET @save_detect= @@GLOBAL.innodb_deadlock_detect;
SET @save_report= @@GLOBAL.innodb_deadlock_report;
SET GLOBAL innodb_deadlock_detect=ON;
@ -163,3 +165,4 @@ ROLLBACK;
disconnect con1;
connection default;
DROP TABLE `t``\""e`;
--enable_view_protocol