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ä
2020-04-29 15:40:51 +03:00
parent d4da131cff 5ba2aa1ddc
commit 496d0372ef
98 changed files with 2800 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/main/mysql_upgrade_noengine.result
View File

@ -1,3 +1,4 @@
# switching from mysql.global_priv to mysql.user
drop view mysql.user_bak;
install soname 'ha_blackhole';
install soname 'ha_archive';
@ -144,6 +145,7 @@ Code 1286
Message Unknown storage engine 'ARCHIVE'
drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv;
# switching from mysql.global_priv to mysql.user
drop view mysql.user_bak;
alter table mysql.user drop column default_role, drop column max_statement_time;
Phase 1/7: Checking and upgrading mysql database
@ -236,6 +238,7 @@ Code 1286
Message Unknown storage engine 'ARCHIVE'
drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv;
# switching from mysql.global_priv to mysql.user
drop view mysql.user_bak;
alter table mysql.user drop column default_role, drop column max_statement_time;
Phase 1/7: Checking and upgrading mysql database