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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-02 20:20:50 +02:00
parent 691e964d23 61acb43689
commit 5ea5291d97
42 changed files with 639 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/plugins/r/audit_null_debug.result
View File

@@ -1,9 +1,4 @@
set @old_sql_mode= @@sql_mode;
set @@sql_mode= '';
alter table mysql.plugin engine=myisam;
Warnings:
Warning 1478 Table storage engine 'MyISAM' does not support the create option 'TRANSACTIONAL=1'
set @@sql_mode= @old_sql_mode;
set @old_dbug=@@debug_dbug;
call mtr.add_suppression("Index for table.*mysql.plugin.MYI");
call mtr.add_suppression("Index for table 'plugin' is corrupt; try to repair it");

3
mysql-test/suite/plugins/t/audit_null_debug.test
View File

@@ -5,10 +5,7 @@ if (!$ADT_NULL_SO) {
skip No NULL_AUDIT plugin;
}
set @old_sql_mode= @@sql_mode;
set @@sql_mode= '';
alter table mysql.plugin engine=myisam;
set @@sql_mode= @old_sql_mode;
set @old_dbug=@@debug_dbug;
call mtr.add_suppression("Index for table.*mysql.plugin.MYI");