MDEV-30205 Move /usr/share/mysql to /usr/share/mariadbbb-11.0-MDEV-30205-pkgtest-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

40 files changed, 250 insertions, 248 deletions

diff --git a/.gitignore b/.gitignore
index 2fb3857120c..fdcb7d8db84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,8 +120,8 @@ scripts/mysql_config.pl
 scripts/mysql_convert_table_format
 scripts/mysql_find_rows
 scripts/mysql_fix_extensions
-scripts/mysql_fix_privilege_tables.sql
-scripts/mysql_fix_privilege_tables_sql.c
+scripts/mariadb_fix_privilege_tables.sql
+scripts/mariadb_fix_privilege_tables_sql.c
 scripts/mysql_install_db
 scripts/mysql_secure_installation
 scripts/mysql_setpermission
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2937a75d636..c7fffff3316 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -288,10 +288,8 @@ centos7:
     # Install packages so tests and the dependencies install
     # @TODO: RPM missing 'patch' and 'diff' as dependency, so installing it manually for now
     - yum install -y rpm/*.rpm patch diffutils
-    # @TODO: Fix on packaging level for /usr/share/mariadb to work and errormsg.sys be found
-    - rm -rf /usr/share/mariadb; ln -s /usr/share/mysql /usr/share/mariadb
     # mtr expects to be launched in-place and with write access to it's own directories
-    - cd /usr/share/mysql-test
+    - cd /usr/share/mariadb-test
     # Skip failing tests
     - |
       echo "
@@ -488,7 +486,7 @@ mini-benchmark:
       mariadb --skip-column-names -e "SELECT @@version, @@version_comment" | tee /tmp/version
       grep $MARIADB_MAJOR_VERSION /tmp/version || echo "MariaDB didn't install properly"
     - yum install -y sysbench procps-ng perf || yum install -y https://kojipkgs.fedoraproject.org//packages/luajit/2.0.4/3.el7/x86_64/luajit-2.0.4-3.el7.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/sysbench/1.0.17/2.el7/x86_64/sysbench-1.0.17-2.el7.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/ck/0.5.2/2.el7/x86_64/ck-0.5.2-2.el7.x86_64.rpm
-    - /usr/share/mysql/mini-benchmark
+    - /usr/share/mariadb/mini-benchmark
     - cp -av */sysbench-run-*.log */metrics.txt ..  # Move files one level down so they can be saved as artifacts
   artifacts:
     when: always
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index ba42549ecfc..9c7da3b9e93 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -18,7 +18,7 @@
 
 #include "client_priv.h"
 #include <sslopt-vars.h>
-#include <../scripts/mysql_fix_privilege_tables_sql.c>
+#include <../scripts/mariadb_fix_privilege_tables_sql.c>
 
 #define VER "2.0"
 #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
@@ -1318,7 +1318,7 @@ static int run_sql_fix_privilege_tables(void)
     a forked mysql client, because the script uses session variables
     and prepared statements.
   */
-  for ( query_ptr= &mysql_fix_privilege_tables[0];
+  for ( query_ptr= &mariadb_fix_privilege_tables[0];
         *query_ptr != NULL;
         query_ptr++
       )
diff --git a/cmake/create_initial_db.cmake b/cmake/create_initial_db.cmake
index ba2b25c0b63..0209d84071e 100644
--- a/cmake/create_initial_db.cmake
+++ b/cmake/create_initial_db.cmake
@@ -30,7 +30,7 @@ ENDIF()
 
 # Create bootstrapper SQL script
 FILE(WRITE bootstrap.sql "use mysql;\n" )
-FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql mysql_performance_tables.sql)
+FOREACH(FILENAME mariadb_system_tables.sql mariadb_system_tables_data.sql mariadb_performance_tables.sql)
    FILE(STRINGS ${TOP_SRCDIR}/scripts/${FILENAME} CONTENTS)
    FOREACH(STR ${CONTENTS})
     IF(NOT STR MATCHES "@current_hostname")
@@ -39,7 +39,7 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql mysql_perf
   ENDFOREACH()
 ENDFOREACH()
 
-FOREACH(FILENAME ${TOP_SRCDIR}/scripts/fill_help_tables.sql ${TOP_SRCDIR}/scripts/mysql_sys_schema.sql)
+FOREACH(FILENAME ${TOP_SRCDIR}/scripts/fill_help_tables.sql ${TOP_SRCDIR}/scripts/mariadb_sys_schema.sql)
   FILE(READ ${FILENAME} CONTENTS)
   FILE(APPEND bootstrap.sql "${CONTENTS}")
 ENDFOREACH()
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 877b147bc6e..eb969679bf7 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -119,7 +119,7 @@ SET(INSTALL_INFODIR_STANDALONE          "docs")
 #
 SET(INSTALL_SHAREDIR_STANDALONE         "share")
 SET(INSTALL_MYSQLSHAREDIR_STANDALONE    "share")
-SET(INSTALL_MYSQLTESTDIR_STANDALONE     "mysql-test")
+SET(INSTALL_MYSQLTESTDIR_STANDALONE     "mariadb-test")
 SET(INSTALL_SQLBENCHDIR_STANDALONE      ".")
 SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
 #
@@ -152,10 +152,10 @@ SET(INSTALL_INFODIR_RPM                 "share/info")
 SET(INSTALL_MANDIR_RPM                  "share/man")
 #
 SET(INSTALL_SHAREDIR_RPM                "share")
-SET(INSTALL_MYSQLSHAREDIR_RPM           "share/mysql")
-SET(INSTALL_MYSQLTESTDIR_RPM            "share/mysql-test")
+SET(INSTALL_MYSQLSHAREDIR_RPM           "share/mariadb")
+SET(INSTALL_MYSQLTESTDIR_RPM            "share/mariadb-test")
 SET(INSTALL_SQLBENCHDIR_RPM             "")
-SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mysql")
+SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mariadb")
 #
 SET(INSTALL_MYSQLDATADIR_RPM            "/var/lib/mysql")
 
@@ -186,10 +186,10 @@ SET(INSTALL_MANDIR_DEB                  "share/man")
 SET(INSTALL_INFODIR_DEB                 "share/info")
 #
 SET(INSTALL_SHAREDIR_DEB                "share")
-SET(INSTALL_MYSQLSHAREDIR_DEB           "share/mysql")
-SET(INSTALL_MYSQLTESTDIR_DEB            "share/mysql/mysql-test")
+SET(INSTALL_MYSQLSHAREDIR_DEB           "share/mariadb")
+SET(INSTALL_MYSQLTESTDIR_DEB            "share/mariadb/mariadb-test")
 SET(INSTALL_SQLBENCHDIR_DEB             ".")
-SET(INSTALL_SUPPORTFILESDIR_DEB         "share/mysql")
+SET(INSTALL_SUPPORTFILESDIR_DEB         "share/mariadb")
 #
 SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
 
@@ -219,7 +219,7 @@ SET(INSTALL_INFODIR_SVR4                "docs")
 #
 SET(INSTALL_SHAREDIR_SVR4               "share")
 SET(INSTALL_MYSQLSHAREDIR_SVR4          "share")
-SET(INSTALL_MYSQLTESTDIR_SVR4           "mysql-test")
+SET(INSTALL_MYSQLTESTDIR_SVR4           "mariadb-test")
 SET(INSTALL_SQLBENCHDIR_SVR4            ".")
 SET(INSTALL_SUPPORTFILESDIR_SVR4        "support-files")
 #
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 1a07a3fea94..f48c8d9dfcf 100644
--- a/debian/mariadb-server-core.install
+++ b/debian/mariadb-server-core.install
@@ -14,38 +14,38 @@ usr/share/man/man1/mysql_upgrade.1
 usr/share/man/man1/resolveip.1
 usr/share/man/man8/mariadbd.8
 usr/share/man/man8/mysqld.8
-usr/share/mysql/bulgarian
-usr/share/mysql/chinese
-usr/share/mysql/charsets
-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/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/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 2350196e9d3..c8928e84711 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-mysqld_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
@@ -88,7 +88,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 dff7dc2d532..d29dbd1251d 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 85e40a8b429..b2d86c9b8f8 100644
--- a/debian/mariadb-test-data.lintian-overrides
+++ b/debian/mariadb-test-data.lintian-overrides
@@ -1,34 +1,34 @@
 # 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-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-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-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
+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 5bac3d60cac..6aa85b4665f 100644
--- a/debian/mariadb-test.lintian-overrides
+++ b/debian/mariadb-test.lintian-overrides
@@ -1,10 +1,10 @@
 # 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/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
+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/mysql-stress-test.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/mysql-test-run.pl]
diff --git a/debian/not-installed b/debian/not-installed
index a75ac911de8..c78319f7b4b 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-embeded.1 which is inte
 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 dc3ee9e9db1..e0de182bef2 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 76506dd03aa..283beb8a256 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -52,8 +52,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 \
diff --git a/man/mysqld_multi.1 b/man/mysqld_multi.1
index e195eb59e2e..76d1c97d206 100644
--- a/man/mysqld_multi.1
+++ b/man/mysqld_multi.1
@@ -579,8 +579,8 @@ script\&. Check especially the lines:
 MY_PWD=`pwd`
 # Check if we are starting this relative (for the binary release)
 if test \-d $MY_PWD/data/mysql \-a \e
-   \-f \&./share/mysql/english/errmsg\&.sys \-a \e
-   \-x \&./bin/mysqld
+   \-f \&./share/mariadb/english/errmsg\&.sys \-a \e
+   \-x \&./bin/mariadbd
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
 .fi
 .if n \{\
@@ -637,28 +637,28 @@ socket     = /tmp/mysql\&.sock2
 port       = 3307
 pid\-file   = /usr/local/mysql/var2/hostname\&.pid2
 datadir    = /usr/local/mysql/var2
-language   = /usr/local/share/mysql/english
+language   = /usr/local/share/mariadb/english
 user       = john
 [mysqld3]
 socket     = /tmp/mysql\&.sock3
 port       = 3308
 pid\-file   = /usr/local/mysql/var3/hostname\&.pid3
 datadir    = /usr/local/mysql/var3
-language   = /usr/local/share/mysql/swedish
+language   = /usr/local/share/mariadb/swedish
 user       = monty
 [mysqld4]
 socket     = /tmp/mysql\&.sock4
 port       = 3309
 pid\-file   = /usr/local/mysql/var4/hostname\&.pid4
 datadir    = /usr/local/mysql/var4
-language   = /usr/local/share/mysql/estonia
+language   = /usr/local/share/mariadb/estonia
 user       = tonu
 [mysqld6]
 socket     = /tmp/mysql\&.sock6
 port       = 3311
 pid\-file   = /usr/local/mysql/var6/hostname\&.pid6
 datadir    = /usr/local/mysql/var6
-language   = /usr/local/share/mysql/japanese
+language   = /usr/local/share/mariadb/japanese
 user       = jani
 .fi
 .if n \{\
diff --git a/mysql-test/README b/mysql-test/README
index ae1d6d56433..b2f9979458e 100644
--- a/mysql-test/README
+++ b/mysql-test/README
@@ -12,18 +12,18 @@ To run the tests in a source directory, you must do "make" first.
 In Red Hat distributions, you should run the script as user "mysql".
 The user is created with nologin shell, so the best bet is something like
   # su -
-  # cd /usr/share/mysql-test
+  # cd /usr/share/mariadb-test
   # su -s /bin/bash mysql -c ./mysql-test-run
 
 This will use the installed MariaDB executables, but will run a private
-copy of the server process (using data files within /usr/share/mysql-test),
+copy of the server process (using data files within /usr/share/mariadb-test),
 so you need not start the mysqld service beforehand.
 
 You can omit --skip-test-list option if you want to check whether
 the listed failures occur for you.
 
 To clean up afterwards, remove the created "var" subdirectory, e.g.
-  # su -s /bin/bash - mysql -c "rm -rf /usr/share/mysql-test/var"
+  # su -s /bin/bash - mysql -c "rm -rf /usr/share/mariadb-test/var"
 
 If tests fail on your system, please read the following manual section
 for instructions on how to report the problem:
@@ -37,7 +37,7 @@ you are expected to provide names of the tests to run.
 For example, here is the command to run the "alias" and "analyze" tests
 with an external server:
 
-  # mysql-test-run --extern socket=/tmp/mysql.sock alias analyze
+  # mariadb-test-run --extern socket=/tmp/mysql.sock alias analyze
 
 To match your setup, you might need to provide other relevant options.
 
@@ -63,20 +63,20 @@ and over again.
 If you are using mysqltest commands in your test case, you should create
 the result file as follows:
 
-  # mysql-test-run --record test_case_name
+  # mariadb-test-run --record test_case_name
 
   or
 
-  # mysqltest --record < t/test_case_name.test
+  # mariadb-test --record < t/test_case_name.test
 
 If you only have a simple test case consisting of SQL statements and
 comments, you can create the result file in one of the following ways:
 
-  # mysql-test-run --record test_case_name
+  # mariadb-test-run --record test_case_name
 
-  # mysql test < t/test_case_name.test > r/test_case_name.result
+  # mariadb test < t/test_case_name.test > r/test_case_name.result
 
-  # mysqltest --record --database test --result-file=r/test_case_name.result < t/test_case_name.test
+  # mariadb-test --record --database test --result-file=r/test_case_name.result < t/test_case_name.test
 
 When this is done, take a look at r/test_case_name.result.
 If the result is incorrect, you have found a bug. In this case, you should
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index fe202279ac7..903b3e48324 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -67,8 +67,8 @@ if (-d '../sql') {
   @plugin_suitedirs= ('storage/*/mysql-test', 'plugin/*/mysql-test', 'storage/*/*/mysql-test', );
   $overlay_regex= '\b(?:storage|plugin|storage[/][^/]*)/(\w+)/mysql-test\b';
 } else {
-  @plugin_suitedirs= ('mysql-test/plugin/*');
-  $overlay_regex= '\bmysql-test/plugin/(\w+)\b';
+  @plugin_suitedirs= ('mariadb-test/plugin/*');
+  $overlay_regex= '\bmariadb-test/plugin/(\w+)\b';
 }
 $plugin_suitedir_regex= $overlay_regex;
 $plugin_suitedir_regex=~ s/\Q(\w+)\E/\\w+/;
@@ -278,8 +278,8 @@ sub load_suite_object {
 sub suite_for_file($) {
   my ($file) = @_;
   return ($2, $1) if $file =~ m@^(.*/$plugin_suitedir_regex/(\w+))/@o;
-  return ($2, $1) if $file =~ m@^(.*/mysql-test/suite/(\w+))/@;
-  return ('main', $1) if $file =~ m@^(.*/mysql-test)/@;
+  return ($2, $1) if $file =~ m@^(.*/(?:mysql|mariadb)-test/suite/(\w+))/@;
+  return ('main', $1) if $file =~ m@^(.*/(?:mysql|mariadb)-test)/@;
   mtr_error("Cannot determine suite for $file");
 }
 
@@ -387,14 +387,14 @@ sub collect_suite_name($$)
     else
     {
       my @dirs = my_find_dir(dirname($::glob_mysql_test_dir),
-                             ["mysql-test/suite", @plugin_suitedirs ],
+                             ["mariadb-test/suite", "mysql-test/suite", @plugin_suitedirs ],
                              $suitename);
       #
       # if $suitename contained wildcards, we'll have many suites and
       # their overlays here. Let's group them appropriately.
       #
       for (@dirs) {
-        m@^.*/(?:mysql-test/suite|$plugin_suitedir_regex)/(.*)$@o or confess $_;
+        m@^.*/(?:mariadb-test/suite|mysql-test/suite|$plugin_suitedir_regex)/(.*)$@o or confess $_;
         push @{$suites{$1}}, $_;
       }
     }
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index db1ebdccfe8..07ae8fcd0eb 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -1254,14 +1254,14 @@ sub command_line_setup {
 
   # In the RPM case, binaries and libraries are installed in the
   # default system locations, instead of having our own private base
-  # directory. And we install "/usr/share/mysql-test". Moving up one
-  # more directory relative to "mysql-test" gives us a usable base
+  # directory. And we install "/usr/share/mariadb-test". Moving up one
+  # more directory relative to "mariadb-test" gives us a usable base
   # directory for RPM installs.
   if ( ! $source_dist and ! -d "$basedir/bin" )
   {
     $basedir= dirname($basedir);
   }
-  # For .deb, it's like RPM, but installed in /usr/share/mysql/mysql-test.
+  # For .deb, it's like RPM, but installed in /usr/share/mariadb/mariadb-test.
   # So move up one more directory level yet.
   if ( ! $source_dist and ! -d "$basedir/bin" )
   {
@@ -1860,7 +1860,8 @@ sub executable_setup () {
   $exe_mysql_plugin=   mtr_exe_exists("$path_client_bindir/mariadb-plugin");
   $exe_mariadb_conv=   mtr_exe_exists("$path_client_bindir/mariadb-conv");
 
-  $exe_mysql_embedded= mtr_exe_maybe_exists("$bindir/libmysqld/examples/mysql_embedded");
+  $exe_mysql_embedded= mtr_exe_maybe_exists("$bindir/libmysqld/examples/mariadb-embedded",
+                                            "$bindir/libmysqld/examples/mysql_embedded");
 
   # Look for mysqltest executable
   if ( $opt_embedded_server )
@@ -1970,11 +1971,15 @@ sub mysql_client_test_arguments(){
   # mysql_client_test executable may _not_ exist
   if ( $opt_embedded_server ) {
     $exe= mtr_exe_maybe_exists(
+            "$bindir/libmysqld/examples$multiconfig/mariadb-client-test-embedded",
+            "$bindir/bin/mariadb-client-test-embedded",
             "$bindir/libmysqld/examples$multiconfig/mysql_client_test_embedded",
-		"$bindir/bin/mysql_client_test_embedded");
+            "$bindir/bin/mysql_client_test_embedded");
   } else {
-    $exe= mtr_exe_maybe_exists("$bindir/tests$multiconfig/mysql_client_test",
-			       "$bindir/bin/mysql_client_test");
+    $exe= mtr_exe_maybe_exists("$bindir/tests$multiconfig/mariadb-client-test",
+                               "$bindir/bin/mariadb-client-test",
+                               "$bindir/tests$multiconfig/mysql_client_test",
+                               "$bindir/bin/mysql_client_test");
   }
 
   my $args;
@@ -2179,10 +2184,10 @@ sub environment_setup {
   # mysql_fix_privilege_tables.sql
   # ----------------------------------------------------
   my $file_mysql_fix_privilege_tables=
-    mtr_file_exists("$bindir/scripts/mysql_fix_privilege_tables.sql",
-		    "$bindir/share/mysql_fix_privilege_tables.sql",
-		    "$bindir/share/mariadb/mysql_fix_privilege_tables.sql",
-		    "$bindir/share/mysql/mysql_fix_privilege_tables.sql");
+    mtr_file_exists("$bindir/scripts/mariadb_fix_privilege_tables.sql",
+		    "$bindir/share/mariadb_fix_privilege_tables.sql",
+		    "$bindir/share/mariadb/mariadb_fix_privilege_tables.sql",
+		    "$bindir/share/mysql/mariadb_fix_privilege_tables.sql");
   $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}=  $file_mysql_fix_privilege_tables;
 
   # ----------------------------------------------------
@@ -2257,6 +2262,8 @@ sub environment_setup {
   # mariabackup
   # ----------------------------------------------------
   my $exe_mariabackup= mtr_exe_maybe_exists(
+      "$bindir/extra/mariabackup$multiconfig/mariadb-backup",
+      "$path_client_bindir/mariadb-backup",
       "$bindir/extra/mariabackup$multiconfig/mariabackup",
       "$path_client_bindir/mariabackup");
 
@@ -3090,7 +3097,7 @@ sub mysql_install_db {
     my $path_sql= my_find_file($install_basedir,
              ["mysql", "sql/share", "share/mariadb",
               "share/mysql", "share", "scripts"],
-             "mysql_system_tables.sql",
+             "mariadb_system_tables.sql",
              NOT_REQUIRED);
 
     if (-f $path_sql )
@@ -3101,7 +3108,7 @@ sub mysql_install_db {
 
       # Add the offical mysql system tables
       # for a production system
-      mtr_appendfile_to_file("$sql_dir/mysql_system_tables.sql",
+      mtr_appendfile_to_file("$sql_dir/mariadb_system_tables.sql",
            $bootstrap_sql_file);
 
       my $gis_sp_path = $source_dist ? "$bindir/scripts" : $sql_dir;
@@ -3110,18 +3117,18 @@ sub mysql_install_db {
 
       # Add the performance tables
       # for a production system
-      mtr_appendfile_to_file("$sql_dir/mysql_performance_tables.sql",
+      mtr_appendfile_to_file("$sql_dir/mariadb_performance_tables.sql",
                             $bootstrap_sql_file);
 
       # Add the mysql system tables initial data
       # for a production system
-      mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
+      mtr_appendfile_to_file("$sql_dir/mariadb_system_tables_data.sql",
            $bootstrap_sql_file);
 
       # Add test data for timezone - this is just a subset, on a real
       # system these tables will be populated either by mysql_tzinfo_to_sql
       # or by downloading the timezone table package from our website
-      mtr_appendfile_to_file("$sql_dir/mysql_test_data_timezone.sql",
+      mtr_appendfile_to_file("$sql_dir/mariadb_test_data_timezone.sql",
            $bootstrap_sql_file);
 
       # Fill help tables, just an empty file when running from bk repo
@@ -3131,7 +3138,7 @@ sub mysql_install_db {
            $bootstrap_sql_file);
 
       # Append sys schema
-      mtr_appendfile_to_file("$gis_sp_path/mysql_sys_schema.sql",
+      mtr_appendfile_to_file("$gis_sp_path/mariadb_sys_schema.sql",
            $bootstrap_sql_file);
 
       mtr_tofile($bootstrap_sql_file, "CREATE DATABASE IF NOT EXISTS test CHARACTER SET latin1 COLLATE latin1_swedish_ci;\n");
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9eec793c9fb..973462911b5 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -34,52 +34,52 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
  TARGET_LINK_LIBRARIES(comp_sql)
 ENDIF()
 
-# Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+# Build mariadb_fix_privilege_tables.sql (concatenate 3 sql scripts)
 IF(NOT WIN32 OR  (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
   MARK_AS_ADVANCED(CAT_EXECUTABLE)
 ENDIF()
 
 IF(NOT ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}"))
-  FOREACH(f fill_help_tables.sql mysql_system_tables_fix.sql mysql_system_tables.sql mysql_system_tables_data.sql mysql_performance_tables.sql)
+  FOREACH(f fill_help_tables.sql mariadb_system_tables_fix.sql mariadb_system_tables.sql mariadb_system_tables_data.sql mariadb_performance_tables.sql)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${f} ${CMAKE_CURRENT_BINARY_DIR}/${f} COPYONLY)
   ENDFOREACH()
 ENDIF()
 
 IF(CAT_EXECUTABLE)
   SET(CAT_COMMAND COMMAND
-    ${CAT_EXECUTABLE} mysql_system_tables_fix.sql mysql_system_tables.sql mysql_performance_tables.sql mysql_sys_schema.sql>
-    mysql_fix_privilege_tables.sql
+    ${CAT_EXECUTABLE} mariadb_system_tables_fix.sql mariadb_system_tables.sql mariadb_performance_tables.sql mariadb_sys_schema.sql>
+    mariadb_fix_privilege_tables.sql
   )
 ELSEIF(WIN32)
   SET(CAT_COMMAND
    COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR}
-   cmd /c copy /b mysql_system_tables_fix.sql + mysql_system_tables.sql +  mysql_performance_tables.sql + mysql_sys_schema.sql
-   mysql_fix_privilege_tables.sql )
+   cmd /c copy /b mariadb_system_tables_fix.sql + mariadb_system_tables.sql +  mariadb_performance_tables.sql + mariadb_sys_schema.sql
+   mariadb_fix_privilege_tables.sql )
 ELSE()
   MESSAGE(FATAL_ERROR "Cannot concatenate files")
 ENDIF()
 
-# Build mysql_fix_privilege_tables.c
+# Build mariadb_fix_privilege_tables.c
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mariadb_fix_privilege_tables_sql.c
   ${CAT_COMMAND}
   COMMAND comp_sql
-  mysql_fix_privilege_tables
-  mysql_fix_privilege_tables.sql
-  mysql_fix_privilege_tables_sql.c
+  mariadb_fix_privilege_tables
+  mariadb_fix_privilege_tables.sql
+  mariadb_fix_privilege_tables_sql.c
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS comp_sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_fix.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_performance_tables.sql
-  ${CMAKE_CURRENT_BINARY_DIR}/mysql_sys_schema.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables_fix.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_performance_tables.sql
+  ${CMAKE_CURRENT_BINARY_DIR}/mariadb_sys_schema.sql
 )
 
 # Add target for the above to be built
 ADD_CUSTOM_TARGET(GenFixPrivs
   ALL
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mariadb_fix_privilege_tables_sql.c
 )
 
 IF(UNIX AND NOT WITHOUT_SERVER)
@@ -109,15 +109,15 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
 
 IF (NOT WITHOUT_SERVER)
 INSTALL(FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_performance_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_db.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_system_tables_data.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_performance_tables.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_test_db.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/fill_help_tables.sql
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_data_timezone.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mariadb_test_data_timezone.sql
   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql
   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql
-  ${CMAKE_CURRENT_BINARY_DIR}/mysql_sys_schema.sql
+  ${CMAKE_CURRENT_BINARY_DIR}/mariadb_sys_schema.sql
   ${FIX_PRIVILEGES_SQL}
   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
 )
@@ -208,8 +208,8 @@ ENDIF()
 
 SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin")
 SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin")
-SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
-SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
+SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mariadb/english $basedir/share/mysql/english")
+SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mariadb $basedir/share/mysql")
 
 # install mysql_install_db.sh at this point since it needs
 # different values for the above variables that will change
diff --git a/scripts/mysql_performance_tables.sql b/scripts/mariadb_performance_tables.sql
index 306160355de..306160355de 100644
--- a/scripts/mysql_performance_tables.sql
+++ b/scripts/mariadb_performance_tables.sql
diff --git a/scripts/mysql_system_tables.sql b/scripts/mariadb_system_tables.sql
index 0c33e40cf57..0c33e40cf57 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mariadb_system_tables.sql
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mariadb_system_tables_data.sql
index ab3dd704d2e..ab3dd704d2e 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mariadb_system_tables_data.sql
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mariadb_system_tables_fix.sql
index a46c49c88b0..a46c49c88b0 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mariadb_system_tables_fix.sql
diff --git a/scripts/mysql_test_data_timezone.sql b/scripts/mariadb_test_data_timezone.sql
index 8d07d413cef..8d07d413cef 100644
--- a/scripts/mysql_test_data_timezone.sql
+++ b/scripts/mariadb_test_data_timezone.sql
diff --git a/scripts/mysql_test_db.sql b/scripts/mariadb_test_db.sql
index c83f2c44a4f..c83f2c44a4f 100644
--- a/scripts/mysql_test_db.sql
+++ b/scripts/mariadb_test_db.sql
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index faf4ae15c7f..206f262b167 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -400,12 +400,12 @@ fi
 
 # Set up paths to SQL scripts required for bootstrap
 fill_help_tables="$srcpkgdatadir/fill_help_tables.sql"
-create_system_tables="$srcpkgdatadir/mysql_system_tables.sql"
-create_system_tables2="$srcpkgdatadir/mysql_performance_tables.sql"
-fill_system_tables="$srcpkgdatadir/mysql_system_tables_data.sql"
+create_system_tables="$srcpkgdatadir/mariadb_system_tables.sql"
+create_system_tables2="$srcpkgdatadir/mariadb_performance_tables.sql"
+fill_system_tables="$srcpkgdatadir/mariadb_system_tables_data.sql"
 maria_add_gis_sp="$buildpkgdatadir/maria_add_gis_sp_bootstrap.sql"
-mysql_test_db="$srcpkgdatadir/mysql_test_db.sql"
-mysql_sys_schema="$buildpkgdatadir/mysql_sys_schema.sql"
+mysql_test_db="$srcpkgdatadir/mariadb_test_db.sql"
+mysql_sys_schema="$buildpkgdatadir/mariadb_sys_schema.sql"
 
 for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp" "$mysql_test_db" "$mysql_sys_schema"
 do
diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt
index ccb268cc4fd..469211d2f1c 100644
--- a/scripts/sys_schema/CMakeLists.txt
+++ b/scripts/sys_schema/CMakeLists.txt
@@ -174,4 +174,4 @@ FOREACH(f ${files})
   FILE(READ ${f} content)
   SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${CMAKE_CONFIGURABLE_FILE_CONTENT}${content}\n")
 ENDFOREACH()
-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/configurable_file_content.in ${CMAKE_BINARY_DIR}/scripts/mysql_sys_schema.sql)
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/configurable_file_content.in ${CMAKE_BINARY_DIR}/scripts/mariadb_sys_schema.sql)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 16d86eea1be..5c1ddb779ed 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -469,14 +469,14 @@ IF(WIN32)
   ADD_CUSTOM_COMMAND(OUTPUT
     ${my_bootstrap_sql}
     COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/scripts
-    cmd /c copy mysql_system_tables.sql+mysql_system_tables_data.sql+fill_help_tables.sql+mysql_performance_tables.sql+mysql_test_db.sql+mysql_sys_schema.sql ${native_outfile}
+    cmd /c copy mariadb_system_tables.sql+mariadb_system_tables_data.sql+fill_help_tables.sql+mariadb_performance_tables.sql+mariadb_test_db.sql+mariadb_sys_schema.sql ${native_outfile}
     DEPENDS
-    ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables.sql
-    ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables_data.sql
+    ${CMAKE_SOURCE_DIR}/scripts/mariadb_system_tables.sql
+    ${CMAKE_SOURCE_DIR}/scripts/mariadb_system_tables_data.sql
     ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql
-    ${CMAKE_SOURCE_DIR}/scripts/mysql_performance_tables.sql
-    ${CMAKE_SOURCE_DIR}/scripts/mysql_test_db.sql
-    ${CMAKE_BINARY_DIR}/scripts/mysql_sys_schema.sql
+    ${CMAKE_SOURCE_DIR}/scripts/mariadb_performance_tables.sql
+    ${CMAKE_SOURCE_DIR}/scripts/mariadb_test_db.sql
+    ${CMAKE_BINARY_DIR}/scripts/mariadb_sys_schema.sql
   )
 
   ADD_CUSTOM_COMMAND(
diff --git a/sql/privilege.h b/sql/privilege.h
index a34d3f4a172..2a4a5cec519 100644
--- a/sql/privilege.h
+++ b/sql/privilege.h
@@ -80,7 +80,7 @@ enum privilege_t: unsigned long long
     In other files:
     - static struct show_privileges_st sys_privileges[]
     - static const char *command_array[] and static uint command_lengths[]
-    - mysql_system_tables.sql and mysql_system_tables_fix.sql
+    - mariadb_system_tables.sql and mariadb_system_tables_fix.sql
     - acl_init() or whatever - to define behaviour for old privilege tables
     - Update User_table_json::get_access()
     - sql_yacc.yy - for GRANT/REVOKE to work
diff --git a/support-files/policy/apparmor/usr.sbin.mysqld b/support-files/policy/apparmor/usr.sbin.mysqld
index c60ecd28531..c9b780bd413 100644
--- a/support-files/policy/apparmor/usr.sbin.mysqld
+++ b/support-files/policy/apparmor/usr.sbin.mysqld
@@ -47,7 +47,7 @@
   /usr/lib/mysql/plugin/ r,
   /usr/lib/mysql/plugin/*.so* mr,
   /usr/sbin/mariadbd mr,
-  /usr/share/mysql/** r,
+  /usr/share/mariadb/** r,
   /var/lib/mysql/ r,
   /var/lib/mysql/** rwk,
   /var/log/mysql.err rw,
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh
index 8a017560623..e71efdb56de 100644
--- a/support-files/rpm/server-postin.sh
+++ b/support-files/rpm/server-postin.sh
@@ -78,7 +78,7 @@ SEDOMPROG=$SETARGETDIR/domains/program
 SECONPROG=$SETARGETDIR/file_contexts/program
 
 if [ -x /usr/sbin/semodule ] ; then
-  /usr/sbin/semodule -i /usr/share/mysql/policy/selinux/mariadb.pp
+  /usr/sbin/semodule -i /usr/share/mariadb/policy/selinux/mariadb.pp
 fi
 
 if [ -x /sbin/restorecon ] ; then
diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
index bf9ed9c4f46..624b47a25cb 100644
--- a/support-files/rpm/server.cnf
+++ b/support-files/rpm/server.cnf
@@ -2,13 +2,16 @@
 # These groups are read by MariaDB server.
 # Use it for options that only the server (but not clients) should see
 #
-# See the examples of server my.cnf files in /usr/share/mysql/
-#
 
 # this is read by the standalone daemon and embedded servers
 [server]
 
-# this is only for the mysqld standalone daemon
+# This group is only read by MariaDB servers, not by MySQL.
+# If you use the same .cnf file for MySQL and MariaDB,
+# you can put MariaDB-only options here
+[mariadb]
+
+# This group is read by both MariaDB and MySQL servers
 [mysqld]
 
 #
@@ -34,11 +37,6 @@
 # this is only for embedded server
 [embedded]
 
-# This group is only read by MariaDB servers, not by MySQL.
-# If you use the same .cnf file for MySQL and MariaDB,
-# you can put MariaDB-only options here
-[mariadb]
-
 # This group is only read by MariaDB-10.8 servers.
 # If you use the same .cnf file for MariaDB of different versions,
 # use this group for options that older servers don't understand