summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Gonzalez <gondchri@amazon.com>2023-01-31 21:13:41 +0000
committerAndrew Hutchings <andrew@linuxjedi.co.uk>2023-02-07 07:29:04 +0000
commit3622644836f3d5be8ff4d075eae3a21183d88119 (patch)
tree2121132e26ee95285a7c5001dc6aa57c34dfb385 /debian
parentd6e3d89c805725a9940952964157bfdcba0973a3 (diff)
downloadmariadb-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 'debian')
-rw-r--r--debian/additions/mariadb.conf.d/50-mysql-clients.cnf2
-rw-r--r--debian/mariadb-server.README.Debian2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/additions/mariadb.conf.d/50-mysql-clients.cnf b/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
index 2f5a3605409..1ec71057405 100644
--- a/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
+++ b/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
@@ -5,7 +5,7 @@
[mysql]
-[mysql_upgrade]
+[mariadb-upgrade]
[mysqladmin]
diff --git a/debian/mariadb-server.README.Debian b/debian/mariadb-server.README.Debian
index 6042249a706..5d47a44649e 100644
--- a/debian/mariadb-server.README.Debian
+++ b/debian/mariadb-server.README.Debian
@@ -102,7 +102,7 @@ The privilege tables are automatically updated so all there is left is read
the release notes on https://mariadb.com/kb/en/release-notes/ to see if any
changes affect custom apps.
-There should not be any need to run 'mysql_upgrade' manually, as the upgrade
+There should not be any need to run 'mariadb-upgrade' manually, as the upgrade
scripts do that automatically.