diff options
| author | Christian Gonzalez <gondchri@amazon.com> | 2023-01-31 21:13:41 +0000 |
|---|---|---|
| committer | Andrew Hutchings <andrew@linuxjedi.co.uk> | 2023-02-07 07:29:04 +0000 |
| commit | 3622644836f3d5be8ff4d075eae3a21183d88119 (patch) | |
| tree | 2121132e26ee95285a7c5001dc6aa57c34dfb385 /mysql-test/include | |
| parent | d6e3d89c805725a9940952964157bfdcba0973a3 (diff) | |
| download | mariadb-git-3622644836f3d5be8ff4d075eae3a21183d88119.tar.gz | |
MDEV-30498 Rename mysql_upgrade state file to mariadb_upgrade
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.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/check-testcase.test | 2 | ||||
| -rw-r--r-- | mysql-test/include/load_dump_and_upgrade.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index 078f6572bed..1038ff30c11 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -97,7 +97,7 @@ select count(*) from mysql.proc; call mtr.check_testcase(); let $datadir=`select @@datadir`; -list_files $datadir mysql_upgrade_info; +list_files $datadir mariadb_upgrade_info; list_files $datadir/test #sql*; list_files $datadir/mysql #sql*; diff --git a/mysql-test/include/load_dump_and_upgrade.inc b/mysql-test/include/load_dump_and_upgrade.inc index 52351ea473c..86ebc12c506 100644 --- a/mysql-test/include/load_dump_and_upgrade.inc +++ b/mysql-test/include/load_dump_and_upgrade.inc @@ -46,4 +46,4 @@ SELECT COUNT(*) > 0 AS `mysql.user has data` FROM mysql.user; # It will fail if the file doesn't exist, which is good, # which is an extra check that it was written ---remove_file $ddir/mysql_upgrade_info +--remove_file $ddir/mariadb_upgrade_info |