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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-01-25 12:44:24 +02:00
parent 5adcb2e7b8 3467f63764
commit 961c7938bb
62 changed files with 1128 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/mysql_system_tables_fix.sql
View File

@ -27,6 +27,7 @@
set sql_mode='';
set default_storage_engine=Aria;
set enforce_storage_engine=NULL;
set alter_algorithm=DEFAULT;
set @have_innodb= (select count(engine) from information_schema.engines where engine='INNODB' and support != 'NO');