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

4
mysql-test/main/rpl_mysql_upgrade_slave_repo_check.test
View File

@ -96,7 +96,7 @@ EOF
--connection master
let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info;
remove_file $datadir/mariadb_upgrade_info;
TRUNCATE TABLE `mysql`.`slave_master_info`;
TRUNCATE TABLE `mysql`.`slave_relay_log_info`;
--remove_file $MYSQLTEST_VARDIR/log/mysql_upgrade_master.log
@ -117,7 +117,7 @@ TRUNCATE TABLE `mysql`.`slave_relay_log_info`;
--echo "====== Clean up ======"
--connection master
let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info;
remove_file $datadir/mariadb_upgrade_info;
DROP TABLE `mysql`.`slave_master_info`, `mysql`.`slave_relay_log_info`;
--remove_file $MYSQLTEST_VARDIR/tmp/slave_table_repo_init.sql