MDEV-30205 Move /usr/share/mysql to /usr/share/mariadb

These are mainly internal files so is a low impact change.

The few scripts/mysql*sql where renames to mariadb_* prefix
on the name.

mysql-test renamed to mariadb-test in the final packages

17 files changed, 141 insertions, 142 deletions

diff --git a/debian/additions/debian-start b/debian/additions/debian-start
index 2a8b61ddaff..2b897e913cf 100755
--- a/debian/additions/debian-start
+++ b/debian/additions/debian-start
@@ -6,7 +6,7 @@
 # Changes to this file will be preserved when updating the Debian package.
 #
 
-source /usr/share/mysql/debian-start.inc.sh
+source /usr/share/mariadb/debian-start.inc.sh
 
 # Read default/mysql first and then default/mariadb just like the init.d file does
 if [ -f /etc/default/mysql ]; then
diff --git a/debian/additions/mariadb.conf.d/60-galera.cnf b/debian/additions/mariadb.conf.d/60-galera.cnf
index 274891b1313..67ccb3edc0e 100644
--- a/debian/additions/mariadb.conf.d/60-galera.cnf
+++ b/debian/additions/mariadb.conf.d/60-galera.cnf
@@ -1,7 +1,7 @@
 #
 # * Galera-related settings
 #
-# See the examples of server wsrep.cnf files in /usr/share/mysql
+# See the examples of server wsrep.cnf files in /usr/share/mariadb
 # and read more at https://mariadb.com/kb/en/galera-cluster/
 
 [galera]
diff --git a/debian/mariadb-plugin-mroonga.install b/debian/mariadb-plugin-mroonga.install
index fedcf62eef0..a78f1db1550 100644
--- a/debian/mariadb-plugin-mroonga.install
+++ b/debian/mariadb-plugin-mroonga.install
@@ -1,5 +1,5 @@
 usr/lib/mysql/plugin/ha_mroonga.so
-usr/share/mysql/mroonga/AUTHORS
-usr/share/mysql/mroonga/COPYING
-usr/share/mysql/mroonga/install.sql
-usr/share/mysql/mroonga/uninstall.sql
+usr/share/mariadb/mroonga/AUTHORS
+usr/share/mariadb/mroonga/COPYING
+usr/share/mariadb/mroonga/install.sql
+usr/share/mariadb/mroonga/uninstall.sql
diff --git a/debian/mariadb-plugin-mroonga.prerm b/debian/mariadb-plugin-mroonga.prerm
index cdd26ebbc45..54cba1e74ff 100644
--- a/debian/mariadb-plugin-mroonga.prerm
+++ b/debian/mariadb-plugin-mroonga.prerm
@@ -3,7 +3,7 @@
 set -e
 
 # Uninstall Mroonga
-mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true
+mariadb --defaults-file=/etc/mysql/debian.cnf < /usr/share/mariadb/mroonga/uninstall.sql || true
 # Always exit with success instead of leaving dpkg in a broken state
 
 
diff --git a/debian/mariadb-server-core.install b/debian/mariadb-server-core.install
index d61c42c77c4..b21dcdc4b85 100644
--- a/debian/mariadb-server-core.install
+++ b/debian/mariadb-server-core.install
@@ -8,39 +8,39 @@ usr/share/man/man1/mariadb-install-db.1
 usr/share/man/man1/mariadb-upgrade.1
 usr/share/man/man1/resolveip.1
 usr/share/man/man8/mariadbd.8
-usr/share/mysql/bulgarian
-usr/share/mysql/charsets
-usr/share/mysql/chinese
-usr/share/mysql/czech
-usr/share/mysql/danish
-usr/share/mysql/dutch
-usr/share/mysql/english
-usr/share/mysql/estonian
-usr/share/mysql/fill_help_tables.sql
-usr/share/mysql/french
-usr/share/mysql/german
-usr/share/mysql/georgian
-usr/share/mysql/greek
-usr/share/mysql/hindi
-usr/share/mysql/hungarian
-usr/share/mysql/italian
-usr/share/mysql/japanese
-usr/share/mysql/korean
-usr/share/mysql/maria_add_gis_sp_bootstrap.sql
-usr/share/mysql/mysql_performance_tables.sql
-usr/share/mysql/mysql_sys_schema.sql
-usr/share/mysql/mysql_system_tables.sql
-usr/share/mysql/mysql_system_tables_data.sql
-usr/share/mysql/mysql_test_data_timezone.sql
-usr/share/mysql/mysql_test_db.sql
-usr/share/mysql/norwegian
-usr/share/mysql/norwegian-ny
-usr/share/mysql/polish
-usr/share/mysql/portuguese
-usr/share/mysql/romanian
-usr/share/mysql/russian
-usr/share/mysql/serbian
-usr/share/mysql/slovak
-usr/share/mysql/spanish
-usr/share/mysql/swedish
-usr/share/mysql/ukrainian
+usr/share/mariadb/bulgarian
+usr/share/mariadb/chinese
+usr/share/mariadb/charsets
+usr/share/mariadb/czech
+usr/share/mariadb/danish
+usr/share/mariadb/dutch
+usr/share/mariadb/english
+usr/share/mariadb/estonian
+usr/share/mariadb/fill_help_tables.sql
+usr/share/mariadb/french
+usr/share/mariadb/german
+usr/share/mariadb/georgian
+usr/share/mariadb/greek
+usr/share/mariadb/hindi
+usr/share/mariadb/hungarian
+usr/share/mariadb/italian
+usr/share/mariadb/japanese
+usr/share/mariadb/korean
+usr/share/mariadb/maria_add_gis_sp_bootstrap.sql
+usr/share/mariadb/mariadb_performance_tables.sql
+usr/share/mariadb/mariadb_sys_schema.sql
+usr/share/mariadb/mariadb_system_tables.sql
+usr/share/mariadb/mariadb_system_tables_data.sql
+usr/share/mariadb/mariadb_test_data_timezone.sql
+usr/share/mariadb/mariadb_test_db.sql
+usr/share/mariadb/norwegian
+usr/share/mariadb/norwegian-ny
+usr/share/mariadb/polish
+usr/share/mariadb/portuguese
+usr/share/mariadb/romanian
+usr/share/mariadb/russian
+usr/share/mariadb/serbian
+usr/share/mariadb/slovak
+usr/share/mariadb/spanish
+usr/share/mariadb/swedish
+usr/share/mariadb/ukrainian
diff --git a/debian/mariadb-server.install b/debian/mariadb-server.install
index 4a849bc2a46..55cb9623b3a 100644
--- a/debian/mariadb-server.install
+++ b/debian/mariadb-server.install
@@ -1,6 +1,6 @@
 debian/additions/debian-start etc/mysql
-debian/additions/debian-start.inc.sh usr/share/mysql
-debian/additions/echo_stderr usr/share/mysql
+debian/additions/debian-start.inc.sh usr/share/mariadb
+debian/additions/echo_stderr usr/share/mariadb
 debian/additions/mariadb.conf.d/50-mariadb_safe.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
 debian/additions/source_mariadb.py usr/share/apport/package-hooks
@@ -75,7 +75,7 @@ usr/share/man/man1/wsrep_sst_mariabackup.1
 usr/share/man/man1/wsrep_sst_mysqldump.1
 usr/share/man/man1/wsrep_sst_rsync.1
 usr/share/man/man1/wsrep_sst_rsync_wan.1
-usr/share/mysql/errmsg-utf8.txt
-usr/share/mysql/mini-benchmark
-usr/share/mysql/wsrep.cnf
-usr/share/mysql/wsrep_notify
+usr/share/mariadb/errmsg-utf8.txt
+usr/share/mariadb/mini-benchmark
+usr/share/mariadb/wsrep.cnf
+usr/share/mariadb/wsrep_notify
diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst
index a5ab6e8e1dc..c256d3d0957 100644
--- a/debian/mariadb-server.postinst
+++ b/debian/mariadb-server.postinst
@@ -52,7 +52,7 @@ case "$1" in
       fi
     fi
 
-    mysql_statedir=/usr/share/mysql
+    mysql_statedir=/usr/share/mariadb
     mysql_datadir=/var/lib/mysql
     mysql_logdir=/var/log/mysql
     mysql_cfgdir=/etc/mysql
diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install
index 718fc0e122c..fd40bf77d22 100644
--- a/debian/mariadb-test-data.install
+++ b/debian/mariadb-test-data.install
@@ -1,6 +1,6 @@
-usr/share/mysql/mysql-test/collections
-usr/share/mysql/mysql-test/include
-usr/share/mysql/mysql-test/main
-usr/share/mysql/mysql-test/plugin
-usr/share/mysql/mysql-test/std_data
-usr/share/mysql/mysql-test/suite
+usr/share/mariadb/mariadb-test/collections
+usr/share/mariadb/mariadb-test/include
+usr/share/mariadb/mariadb-test/main
+usr/share/mariadb/mariadb-test/plugin
+usr/share/mariadb/mariadb-test/std_data
+usr/share/mariadb/mariadb-test/suite
diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides
index b73e31029e6..cb05b748061 100644
--- a/debian/mariadb-test-data.lintian-overrides
+++ b/debian/mariadb-test-data.lintian-overrides
@@ -1,32 +1,32 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
-arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
-arch-independent-package-contains-binary-or-object [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
+arch-dependent-file-in-usr-share [usr/share/mariadb/mariadb-test/suite/plugins/pam/pam_mariadb_mtr.so]
+arch-independent-package-contains-binary-or-object [usr/share/mariadb/mariadb-test/suite/plugins/pam/pam_mariadb_mtr.so]
 # Mainly for support for *BSD family. Not right way to do but this is test package and not for production
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_1/lib/DataGen_local.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_1/lib/DataGen_modify.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/rpl/extension/checksum.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/std_data/checkDBI_DBD-MariaDB.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/engines/rr_trx/run_stress_tx_rr.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/funcs_1/lib/DataGen_local.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/funcs_1/lib/DataGen_modify.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/funcs_2/lib/gen_charset_utf8.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/rpl/extension/checksum.pl]
 # Intentional for test files
-national-encoding usr/share/mysql/mysql-test/*
+national-encoding usr/share/mariadb/mariadb-test/*
 # Extra test documentation files that really need to be kept in context in test directory
-package-contains-documentation-outside-usr-share-doc usr/share/mysql/mysql-test/*
+package-contains-documentation-outside-usr-share-doc usr/share/mariadb/mariadb-test/*
 # Intentional directory structure
-repeated-path-segment auth_gssapi usr/share/mysql/mysql-test/plugin/auth_gssapi/auth_gssapi/
-repeated-path-segment connect usr/share/mysql/mysql-test/plugin/connect/connect/
-repeated-path-segment disks usr/share/mysql/mysql-test/plugin/disks/disks/
-repeated-path-segment func_test usr/share/mysql/mysql-test/plugin/func_test/func_test/
-repeated-path-segment metadata_lock_info usr/share/mysql/mysql-test/plugin/metadata_lock_info/metadata_lock_info/
-repeated-path-segment mroonga usr/share/mysql/mysql-test/plugin/mroonga/mroonga/
-repeated-path-segment mroonga usr/share/mysql/mysql-test/plugin/mroonga/mroonga/include/mroonga/
-repeated-path-segment oqgraph usr/share/mysql/mysql-test/plugin/oqgraph/oqgraph/
-repeated-path-segment query_response_time usr/share/mysql/mysql-test/plugin/query_response_time/query_response_time/
-repeated-path-segment rocksdb usr/share/mysql/mysql-test/plugin/rocksdb/rocksdb/
-repeated-path-segment sequence usr/share/mysql/mysql-test/plugin/sequence/sequence/
-repeated-path-segment sphinx usr/share/mysql/mysql-test/plugin/sphinx/sphinx/
-repeated-path-segment spider usr/share/mysql/mysql-test/plugin/spider/spider/
-repeated-path-segment type_inet usr/share/mysql/mysql-test/plugin/type_inet/type_inet/
-repeated-path-segment type_test usr/share/mysql/mysql-test/plugin/type_test/type_test/
-repeated-path-segment user_variables usr/share/mysql/mysql-test/plugin/user_variables/user_variables/
-repeated-path-segment wsrep_info usr/share/mysql/mysql-test/plugin/wsrep_info/wsrep_info/
+repeated-path-segment auth_gssapi usr/share/mariadb/mariadb-test/plugin/auth_gssapi/auth_gssapi/
+repeated-path-segment connect usr/share/mariadb/mariadb-test/plugin/connect/connect/
+repeated-path-segment disks usr/share/mariadb/mariadb-test/plugin/disks/disks/
+repeated-path-segment func_test usr/share/mariadb/mariadb-test/plugin/func_test/func_test/
+repeated-path-segment metadata_lock_info usr/share/mariadb/mariadb-test/plugin/metadata_lock_info/metadata_lock_info/
+repeated-path-segment mroonga usr/share/mariadb/mariadb-test/plugin/mroonga/mroonga/
+repeated-path-segment mroonga usr/share/mariadb/mariadb-test/plugin/mroonga/mroonga/include/mroonga/
+repeated-path-segment oqgraph usr/share/mariadb/mariadb-test/plugin/oqgraph/oqgraph/
+repeated-path-segment query_response_time usr/share/mariadb/mariadb-test/plugin/query_response_time/query_response_time/
+repeated-path-segment rocksdb usr/share/mariadb/mariadb-test/plugin/rocksdb/rocksdb/
+repeated-path-segment sequence usr/share/mariadb/mariadb-test/plugin/sequence/sequence/
+repeated-path-segment sphinx usr/share/mariadb/mariadb-test/plugin/sphinx/sphinx/
+repeated-path-segment spider usr/share/mariadb/mariadb-test/plugin/spider/spider/
+repeated-path-segment type_inet usr/share/mariadb/mariadb-test/plugin/type_inet/type_inet/
+repeated-path-segment type_test usr/share/mariadb/mariadb-test/plugin/type_test/type_test/
+repeated-path-segment user_variables usr/share/mariadb/mariadb-test/plugin/user_variables/user_variables/
+repeated-path-segment wsrep_info usr/share/mariadb/mariadb-test/plugin/wsrep_info/wsrep_info/
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index 5dda38d665c..c4a58246820 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -35,17 +35,17 @@ usr/share/man/man1/mysql_client_test.1
 usr/share/man/man1/mysql_client_test_embedded.1
 usr/share/man/man1/mysqltest.1
 usr/share/man/man1/mysqltest_embedded.1
-usr/share/mysql/mysql-test/README
-usr/share/mysql/mysql-test/README-gcov
-usr/share/mysql/mysql-test/README.stress
-usr/share/mysql/mysql-test/dgcov.pl
-usr/share/mysql/mysql-test/lib
-usr/share/mysql/mysql-test/mariadb-stress-test.pl
-usr/share/mysql/mysql-test/mariadb-test-run
-usr/share/mysql/mysql-test/mariadb-test-run.pl
-usr/share/mysql/mysql-test/mtr
-usr/share/mysql/mysql-test/mysql-test-run
-usr/share/mysql/mysql-test/mysql-test-run.pl
-usr/share/mysql/mysql-test/purify.supp
-usr/share/mysql/mysql-test/suite.pm
-usr/share/mysql/mysql-test/valgrind.supp
+usr/share/mariadb/mariadb-test/README
+usr/share/mariadb/mariadb-test/README-gcov
+usr/share/mariadb/mariadb-test/README.stress
+usr/share/mariadb/mariadb-test/dgcov.pl
+usr/share/mariadb/mariadb-test/lib
+usr/share/mariadb/mariadb-test/mariadb-stress-test.pl
+usr/share/mariadb/mariadb-test/mariadb-test-run
+usr/share/mariadb/mariadb-test/mariadb-test-run.pl
+usr/share/mariadb/mariadb-test/mtr
+usr/share/mariadb/mariadb-test/mysql-test-run
+usr/share/mariadb/mariadb-test/mysql-test-run.pl
+usr/share/mariadb/mariadb-test/purify.supp
+usr/share/mariadb/mariadb-test/suite.pm
+usr/share/mariadb/mariadb-test/valgrind.supp
diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links
deleted file mode 100644
index 3939176ee96..00000000000
--- a/debian/mariadb-test.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run.pl
diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides
index d09cfe3c537..6e7bdf05e39 100644
--- a/debian/mariadb-test.lintian-overrides
+++ b/debian/mariadb-test.lintian-overrides
@@ -1,8 +1,8 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21653
-arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process]
-arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version]
+arch-dependent-file-in-usr-share [usr/share/mariadb/mariadb-test/lib/My/SafeProcess/my_safe_process]
+arch-dependent-file-in-usr-share [usr/share/mariadb/mariadb-test/lib/My/SafeProcess/wsrep_check_version]
 # Mainly for support for *BSD family. Not right way to do but this is test package and not for production
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/process-purecov-annotations.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/v1/mysql-test-run.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-stress-test.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-test-run.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/lib/process-purecov-annotations.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/lib/v1/mysql-test-run.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/mariadb-stress-test.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/mariadb-test-run.pl]
diff --git a/debian/not-installed b/debian/not-installed
index c0d08565616..1cbeeade721 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -29,7 +29,7 @@ usr/lib/mysql/plugin/type_test.so
 usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
 usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
 usr/sbin/rcmysql
-usr/share/doc/mariadb-server/COPYING (related file: "debian/tmp/usr/share/mysql/mroonga/COPYING")
+usr/share/doc/mariadb-server/COPYING (related file: "debian/tmp/usr/share/mariadb/mroonga/COPYING")
 usr/share/doc/mariadb-server/CREDITS
 usr/share/doc/mariadb-server/INSTALL-BINARY
 usr/share/doc/mariadb-server/README-wsrep
@@ -44,30 +44,30 @@ usr/share/man/man1/mysql_embedded.1 # Symlink to mariadb-embedded.1 which is int
 usr/share/man/man1/my_safe_process.1
 usr/share/man/man1/mysql-stress-test.pl.1
 usr/share/man/man1/mysql.server.1
-usr/share/mysql/JavaWrappers.jar
-usr/share/mysql/JdbcInterface.jar
-usr/share/mysql/Mongo2.jar
-usr/share/mysql/Mongo3.jar
-usr/share/mysql/binary-configure
-usr/share/mysql/magic
-usr/share/mysql/mariadb.logrotate
-usr/share/mysql/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
-usr/share/mysql/mysql-test/asan.supp
-usr/share/mysql/mysql-test/lsan.supp
-usr/share/mysql/mysql-test/unstable-tests
-usr/share/mysql/mysql.server # Debian packaging uses mariadb-server.mariadb.init
-usr/share/mysql/mysqld_multi.server
-usr/share/mysql/policy/apparmor/README # In MariaDB we don't want to use AppArmor at the moment
-usr/share/mysql/policy/apparmor/usr.sbin.mysqld # In MariaDB we don't want to use AppArmor at the moment
-usr/share/mysql/policy/apparmor/usr.sbin.mysqld.local # In MariaDB we don't want to use AppArmor at the moment
-usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment
-usr/share/mysql/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment
-usr/share/mysql/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment
-usr/share/mysql/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment
-usr/share/mysql/systemd/mariadb-extra@.socket # Installed by rules file
-usr/share/mysql/systemd/mariadb.service # Installed by rules file
-usr/share/mysql/systemd/mariadb@.service # Installed by rules file
-usr/share/mysql/systemd/mariadb@.socket # Installed by rules file
-usr/share/mysql/systemd/mysql.service  # Installed by rules file
-usr/share/mysql/systemd/mysqld.service  # Installed by rules file
-usr/share/mysql/systemd/use_galera_new_cluster.conf
+usr/share/mariadb/JavaWrappers.jar
+usr/share/mariadb/JdbcInterface.jar
+usr/share/mariadb/Mongo2.jar
+usr/share/mariadb/Mongo3.jar
+usr/share/mariadb/binary-configure
+usr/share/mariadb/magic
+usr/share/mariadb/mariadb.logrotate
+usr/share/mariadb/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
+usr/share/mariadb/mariadb-test/asan.supp
+usr/share/mariadb/mariadb-test/lsan.supp
+usr/share/mariadb/mariadb-test/unstable-tests
+usr/share/mariadb/mysql.server # Debian packaging uses mariadb-server.mariadb.init
+usr/share/mariadb/mysqld_multi.server
+usr/share/mariadb/policy/apparmor/README # In MariaDB we don't want to use AppArmor at the moment
+usr/share/mariadb/policy/apparmor/usr.sbin.mysqld # In MariaDB we don't want to use AppArmor at the moment
+usr/share/mariadb/policy/apparmor/usr.sbin.mysqld.local # In MariaDB we don't want to use AppArmor at the moment
+usr/share/mariadb/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment
+usr/share/mariadb/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment
+usr/share/mariadb/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment
+usr/share/mariadb/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment
+usr/share/mariadb/systemd/mariadb-extra@.socket # Installed by rules file
+usr/share/mariadb/systemd/mariadb.service # Installed by rules file
+usr/share/mariadb/systemd/mariadb@.service # Installed by rules file
+usr/share/mariadb/systemd/mariadb@.socket # Installed by rules file
+usr/share/mariadb/systemd/mysql.service  # Installed by rules file
+usr/share/mariadb/systemd/mysqld.service  # Installed by rules file
+usr/share/mariadb/systemd/use_galera_new_cluster.conf
diff --git a/debian/rules b/debian/rules
index 0eb80bfb41f..85ba7d0da12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,7 +159,7 @@ endif
 	cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) > /dev/null
 
 	# If mariadb-test package is removed, also remove most of it's files
-	grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mysql/mysql-test
+	grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mariadb/mariadb-test
 
 	# Delete private files from libraries so they don't get shipped in the -dev packages
 	rm -r $(TMP)/usr/include/mariadb/server/private
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 77a8147f470..91013f2ca03 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -321,7 +321,7 @@ test basic features:
       password=asdf234
       protocol=tcp
       EOF
-      export CERT_PATH=/usr/share/mysql/mysql-test/std_data
+      export CERT_PATH=/usr/share/mariadb/mariadb-test/std_data
       openssl verify -CAfile $CERT_PATH/cacert.pem $CERT_PATH/server-cert.pem
       openssl x509 -subject -issuer -noout -in $CERT_PATH/cacert.pem
       openssl x509 -subject -issuer -noout -in $CERT_PATH/server-cert.pem
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 7686591f0a8..fc7a8780651 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -50,8 +50,8 @@ very-long-line-length-in-source-file plugin/handler_socket/regtest/test_01_lib/t
 # SQL source file that has very long inserts/selects
 very-long-line-length-in-source-file mysql-test/std_data/init_file_longline_3816.sql *
 very-long-line-length-in-source-file scripts/fill_help_tables.sql *
-very-long-line-length-in-source-file scripts/mysql_system_tables.sql *
-very-long-line-length-in-source-file scripts/mysql_test_data_timezone.sql *
+very-long-line-length-in-source-file scripts/mariadb_system_tables.sql *
+very-long-line-length-in-source-file scripts/mariadb_test_data_timezone.sql *
 # Machine formatted HTML
 very-long-line-length-in-source-file sql/share/charsets/languages.html *
 very-long-line-length-in-source-file sql/share/errmsg-utf8.txt *
diff --git a/debian/tests/upstream b/debian/tests/upstream
index c48701864b7..dc55c74ad97 100644
--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -26,12 +26,12 @@ echo "Setting up skip-tests-list"
 
 # Use unstable-tests list as base to skip all tests  considered unstable
 # or create an empty file if that upstream file does not exists on this branch
-cp /usr/share/mysql/mysql-test/unstable-tests $SKIP_TEST_LST || touch $SKIP_TEST_LST
+cp /usr/share/mariadb/mariadb-test/unstable-tests $SKIP_TEST_LST || touch $SKIP_TEST_LST
 
 # Also use the arch specific skiplists if exist
-if [ -f /usr/share/mysql/mysql-test/unstable-tests.$ARCH ]
+if [ -f /usr/share/mariadb/mariadb-test/unstable-tests.$ARCH ]
 then
-  cat /usr/share/mysql/mysql-test/unstable-tests.$ARCH >> $SKIP_TEST_LST
+  cat /usr/share/mariadb/mariadb-test/unstable-tests.$ARCH >> $SKIP_TEST_LST
 fi
 
 # Skip tests that cannot run properly on ci.debian.net / autopkgtests.ubuntu.com
@@ -61,9 +61,9 @@ fi
 # failed autopkgtest runs
 cp -v $SKIP_TEST_LST $AUTOPKGTEST_ARTIFACTS
 
-cd /usr/share/mysql/mysql-test
-echo "starting mysql-test-tun.pl..."
-eatmydata perl -I. ./mysql-test-run.pl --suite=main \
+cd /usr/share/mariadb/mariadb-test
+echo "starting mariadb-test-run.pl..."
+eatmydata perl -I. ./mariadb-test-run.pl --suite=main \
     --vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \
     --parallel=auto --skip-rpl \
     --force --skip-test-list=$SKIP_TEST_LST \