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

MDEV-30498 Rename mysql_upgrade state file to mariadb_upgrade

Browse Source 
Renames the upgrade state file, and ensures the old
file is properly removed when `mariadb-upgrade` tool is executed.

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer
Amazon Web Services, Inc.
This commit is contained in:
Christian Gonzalez
2023-01-31 21:13:41 +00:00
committed by Andrew Hutchings
parent d6e3d89c80
commit 3622644836
34 changed files with 120 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/main/mysql_upgrade_noengine.test
View File

@ -46,9 +46,9 @@ drop view mysql.user_bak;
# pretend it's an upgrade from 10.0
alter table mysql.user drop column default_role, drop column max_statement_time;
# but mysql_upgrade_info tells otherwise
remove_file $datadir/mysql_upgrade_info;
write_file $datadir/mysql_upgrade_info;
# but mariadb_upgrade_info tells otherwise
remove_file $datadir/mariadb_upgrade_info;
write_file $datadir/mariadb_upgrade_info;
10.1.10-MariaDB
EOF
@ -64,7 +64,7 @@ source include/switch_to_mysql_user.inc;
drop view mysql.user_bak;
alter table mysql.user drop column default_role, drop column max_statement_time;
remove_file $datadir/mysql_upgrade_info;
remove_file $datadir/mariadb_upgrade_info;
--echo # upgrade from 10.0 - engines are enabled
--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
@ -74,7 +74,7 @@ select table_catalog, table_schema, table_name, table_type, engine, row_format,
drop table t1, t2;
remove_file $datadir/mysql_upgrade_info;
remove_file $datadir/mariadb_upgrade_info;
uninstall plugin blackhole;
uninstall plugin archive;