MDEV-21303 Make executables MariaDB named

To change all executables to have a mariadb name I had to:
- Do name changes in every CMakeLists.txt that produces executables
- CREATE_MARIADB_SYMLINK was removed and GET_SYMLINK added by Wlad to reuse the function in other places also
- The scripts/CMakeLists.txt could make use of GET_SYMLINK instead of introducing redundant code, but I thought I'll leave that for next release
- A lot of changes to debian/.install and debian/.links files due to swapping of real executable and symlink. I did not however change the name of the manpages, so the real name is still mysql there and mariadb are symlinks.
- The Windows part needed a change now when we made the executables mariadb -named. MSI (and ZIP) do not support symlinks and to not break backward compatibility we had to include mysql named binaries also. Done by Wlad

17 files changed, 93 insertions, 85 deletions

diff --git a/debian/control b/debian/control
index 198471c31e1..a63881f61cf 100644
--- a/debian/control
+++ b/debian/control
@@ -244,6 +244,7 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-10.2,
            mariadb-client-10.3,
            mariadb-client-10.4,
+           mariadb-client-10.5 (<< ${source:Version}),
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -271,6 +272,7 @@ Replaces: mariadb-client-10.0,
           mariadb-client-10.2,
           mariadb-client-10.3,
           mariadb-client-10.4,
+          mariadb-client-10.5 (<< ${source:Version}),
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -322,6 +324,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mariadb-client-10.2,
            mariadb-client-10.3,
            mariadb-client-10.4,
+           mariadb-client-10.5 (<< ${source:Version}),
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -339,10 +342,12 @@ Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.2,
           mariadb-client-10.3,
           mariadb-client-10.4,
+          mariadb-client-10.5 (<< ${source:Version}),
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
           mariadb-client-5.5,
+          mariadb-server-10.5 (<< ${source:Version}),
           mysql-client (<< 5.0.51),
           mysql-client-5.0,
           mysql-client-5.1,
@@ -396,6 +401,7 @@ Breaks: mariadb-client-10.0,
         mariadb-client-10.2,
         mariadb-client-10.3,
         mariadb-client-10.4,
+        mariadb-client-10.5 (<< ${source:Version}),
         mariadb-server-10.3,
         mariadb-server-10.4,
         mariadb-server-10.5 (<< ${source:Version})
@@ -404,6 +410,7 @@ Replaces: mariadb-client-10.0,
           mariadb-client-10.2,
           mariadb-client-10.3,
           mariadb-client-10.4,
+          mariadb-client-10.5 (<< ${source:Version}),
           mariadb-server-10.3,
           mariadb-server-10.4,
           mariadb-server-10.5 (<< ${source:Version}),
@@ -487,6 +494,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
            virtual-mysql-server
 Replaces: libmariadbclient-dev (<< 5.5.0),
           libmariadbclient16 (<< 5.3.4),
+          mariadb-client-10.5 (<< ${source:Version}),
           mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index 0625dec7a9e..4d6d74643fb 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -1,4 +1,4 @@
-usr/bin/mariadb_config
+usr/bin/mariadb-config
 usr/include/mariadb
 usr/lib/*/libmariadb.so
 usr/lib/*/libmariadbclient.a
@@ -7,3 +7,4 @@ usr/lib/*/libmysqlservices.a
 usr/lib/*/pkgconfig/mariadb.pc
 usr/share/aclocal/mysql.m4
 usr/share/man/man1/mysql_config.1
+usr/share/man/man1/mariadb-config.1
\ No newline at end of file
diff --git a/debian/libmariadb-dev.links b/debian/libmariadb-dev.links
index 6a7bf707ca7..80ae8c1e700 100644
--- a/debian/libmariadb-dev.links
+++ b/debian/libmariadb-dev.links
@@ -1 +1 @@
-usr/share/man/man1/mysql_config.1.gz usr/share/man/man1/mariadb_config.1.gz
+usr/bin/mariadb-config usr/bin/mysql_config
\ No newline at end of file
diff --git a/debian/mariadb-backup.install b/debian/mariadb-backup.install
index 2bc61c12079..b332b8724d5 100644
--- a/debian/mariadb-backup.install
+++ b/debian/mariadb-backup.install
@@ -1,4 +1,4 @@
-usr/bin/mariabackup
+usr/bin/mariadb-backup
 usr/bin/mbstream
 usr/share/man/man1/mariabackup.1
 usr/share/man/man1/mariadb-backup.1
diff --git a/debian/mariadb-backup.links b/debian/mariadb-backup.links
index 7980ef5e54d..924b476393b 100644
--- a/debian/mariadb-backup.links
+++ b/debian/mariadb-backup.links
@@ -1 +1 @@
-usr/bin/mariabackup usr/bin/mariadb-backup
+usr/bin/mariadb-backup usr/bin/mariabackup
diff --git a/debian/mariadb-client-10.5.install b/debian/mariadb-client-10.5.install
index 67c0c2619c3..eba63ad76cd 100644
--- a/debian/mariadb-client-10.5.install
+++ b/debian/mariadb-client-10.5.install
@@ -1,27 +1,25 @@
 debian/additions/innotop/innotop usr/bin/
 debian/additions/mysqlreport usr/bin/
+usr/bin/mariadb-access
+usr/bin/mariadb-admin
 usr/bin/mariadb-conv
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
-usr/bin/mysql_waitpid
-usr/bin/mysqlaccess
-usr/bin/mysqladmin
-usr/bin/mysqldump
-usr/bin/mysqldumpslow
-usr/bin/mysqlimport
-usr/bin/mysqlshow
-usr/bin/mysqlslap
+usr/bin/mariadb-dump
+usr/bin/mariadb-dumpslow
+usr/bin/mariadb-find-rows
+usr/bin/mariadb-fix-extensions
+usr/bin/mariadb-import
+usr/bin/mariadb-show
+usr/bin/mariadb-slap
+usr/bin/mariadb-waitpid
 usr/bin/mytop
 usr/share/man/man1/mariadb-access.1
 usr/share/man/man1/mariadb-admin.1
-usr/share/man/man1/mariadb-binlog.1
-usr/share/man/man1/mariadb-conv.1
 usr/share/man/man1/mariadb-dump.1
 usr/share/man/man1/mariadb-dumpslow.1
 usr/share/man/man1/mariadb-find-rows.1
 usr/share/man/man1/mariadb-fix-extensions.1
 usr/share/man/man1/mariadb-import.1
-usr/share/man/man1/mariadb-plugin.1
+usr/share/man/man1/mariadb-show.1
 usr/share/man/man1/mariadb-slap.1
 usr/share/man/man1/mariadb-waitpid.1
 usr/share/man/man1/mysql_find_rows.1
diff --git a/debian/mariadb-client-10.5.links b/debian/mariadb-client-10.5.links
index 5d966575b76..85b2c73a30b 100644
--- a/debian/mariadb-client-10.5.links
+++ b/debian/mariadb-client-10.5.links
@@ -1,25 +1,23 @@
-usr/bin/mysql_find_rows usr/bin/mariadb-find-rows
-usr/bin/mysql_fix_extensions usr/bin/mariadb-fix-extensions
-usr/bin/mysql_plugin usr/bin/mariadb-plugin
-usr/bin/mysql_waitpid usr/bin/mariadb-waitpid
-usr/bin/mysqlaccess usr/bin/mariadb-access
-usr/bin/mysqladmin usr/bin/mariadb-admin
-usr/bin/mysqlbinlog usr/bin/mariadb-binlog
-usr/bin/mysqlcheck usr/bin/mariadb-analyze
-usr/bin/mysqlcheck usr/bin/mariadb-optimize
-usr/bin/mysqlcheck usr/bin/mariadb-repair
-usr/bin/mysqlcheck usr/bin/mysqlanalyze
-usr/bin/mysqlcheck usr/bin/mysqloptimize
-usr/bin/mysqlcheck usr/bin/mysqlrepair
-usr/bin/mysqldump usr/bin/mariadb-dump
-usr/bin/mysqldumpslow usr/bin/mariadb-dumpslow
-usr/bin/mysqlimport usr/bin/mariadb-import
-usr/bin/mysqlreport usr/bin/mariadb-report
-usr/bin/mysqlslap usr/bin/mariadb-slap
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-analyze.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-optimize.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-repair.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
-usr/share/man/man1/mysqlreport.1.gz usr/share/man/man1/mariadb-report.1.gz
+usr/bin/mariadb-access usr/bin/mysqlaccess
+usr/bin/mariadb-admin usr/bin/mysqladmin
+usr/bin/mariadb-dump usr/bin/mysqldump
+usr/bin/mariadb-dumpslow usr/bin/mysqldumpslow
+usr/bin/mariadb-find-rows usr/bin/mysql_find_rows
+usr/bin/mariadb-fix-extensions usr/bin/mysql_fix_extensions
+usr/bin/mariadb-import usr/bin/mysqlimport
+usr/bin/mariadb-report usr/bin/mysqlreport
+usr/bin/mariadb-show usr/bin/mysqlshow
+usr/bin/mariadb-slap usr/bin/mysqlslap
+usr/bin/mariadb-waitpid usr/bin/mysql_waitpid
+usr/bin/mariadb-check usr/bin/mariadb-analyze
+usr/bin/mariadb-check usr/bin/mariadb-optimize
+usr/bin/mariadb-check usr/bin/mariadb-repair
+usr/bin/mariadb-check usr/bin/mysqlanalyze
+usr/bin/mariadb-check usr/bin/mysqloptimize
+usr/bin/mariadb-check usr/bin/mysqlrepair
+usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb-analyze.1
+usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb-optimize.1
+usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb-repair.1
+usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqlanalyze.1
+usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqloptimize.1
+usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqlrepair.1
diff --git a/debian/mariadb-client-core-10.5.install b/debian/mariadb-client-core-10.5.install
index 4cc61674770..224e324b704 100644
--- a/debian/mariadb-client-core-10.5.install
+++ b/debian/mariadb-client-core-10.5.install
@@ -1,5 +1,5 @@
-usr/bin/mysql
-usr/bin/mysqlcheck
+usr/bin/mariadb
+usr/bin/mariadb-check
 usr/share/man/man1/mariadb-check.1
 usr/share/man/man1/mariadb.1
 usr/share/man/man1/mysql.1
diff --git a/debian/mariadb-client-core-10.5.links b/debian/mariadb-client-core-10.5.links
index d889e7164b0..343cf6ff78b 100644
--- a/debian/mariadb-client-core-10.5.links
+++ b/debian/mariadb-client-core-10.5.links
@@ -1,2 +1,2 @@
-usr/bin/mysql usr/bin/mariadb
-usr/bin/mysqlcheck usr/bin/mariadb-check
+usr/bin/mariadb usr/bin/mysql
+usr/bin/mariadb-check usr/bin/mysqlcheck
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
index 80987612c30..0ac42fed69a 100644
--- a/debian/mariadb-plugin-rocksdb.install
+++ b/debian/mariadb-plugin-rocksdb.install
@@ -1,6 +1,7 @@
 etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
+usr/bin/mariadb-ldb
 usr/bin/myrocks_hotbackup
-usr/bin/mysql_ldb
+usr/bin/sst_dump
 usr/lib/mysql/plugin/ha_rocksdb.so
 usr/share/man/man1/mariadb-ldb.1
 usr/share/man/man1/myrocks_hotbackup.1
diff --git a/debian/mariadb-plugin-rocksdb.links b/debian/mariadb-plugin-rocksdb.links
index 78e47d43359..d24682a5a66 100644
--- a/debian/mariadb-plugin-rocksdb.links
+++ b/debian/mariadb-plugin-rocksdb.links
@@ -1 +1 @@
-usr/bin/mysql_ldb usr/bin/mariadb-ldb
+usr/bin/mariadb-ldb usr/bin/mysql_ldb
diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.5.install
index 4a860ff57df..bd550987197 100644
--- a/debian/mariadb-server-10.5.install
+++ b/debian/mariadb-server-10.5.install
@@ -14,22 +14,22 @@ usr/bin/aria_pack
 usr/bin/aria_read_log
 usr/bin/galera_new_cluster
 usr/bin/galera_recovery
+usr/bin/mariadb-binlog
+usr/bin/mariadb-convert-table-format
+usr/bin/mariadb-hotcopy
+usr/bin/mariadb-plugin
+usr/bin/mariadb-secure-installation
 usr/bin/mariadb-service-convert
+usr/bin/mariadb-setpermission
+usr/bin/mariadb-tzinfo-to-sql
+usr/bin/mariadbd-multi
+usr/bin/mariadbd-safe
+usr/bin/mariadbd-safe-helper
 usr/bin/msql2mysql
 usr/bin/myisam_ftdump
 usr/bin/myisamchk
 usr/bin/myisamlog
 usr/bin/myisampack
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_plugin
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysqlbinlog
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqld_safe_helper
-usr/bin/mysqlhotcopy
 usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
@@ -67,12 +67,13 @@ usr/share/man/man1/aria_pack.1
 usr/share/man/man1/aria_read_log.1
 usr/share/man/man1/galera_new_cluster.1
 usr/share/man/man1/galera_recovery.1
+usr/share/man/man1/mariadb-binlog.1
 usr/share/man/man1/mariadb-convert-table-format.1
 usr/share/man/man1/mariadb-hotcopy.1
+usr/share/man/man1/mariadb-plugin.1
 usr/share/man/man1/mariadb-secure-installation.1
 usr/share/man/man1/mariadb-service-convert.1
 usr/share/man/man1/mariadb-setpermission.1
-usr/share/man/man1/mariadb-show.1
 usr/share/man/man1/mariadb-tzinfo-to-sql.1
 usr/share/man/man1/mariadbd-multi.1
 usr/share/man/man1/mariadbd-safe-helper.1
diff --git a/debian/mariadb-server-10.5.links b/debian/mariadb-server-10.5.links
index f2d97460371..9cc3a436ba8 100644
--- a/debian/mariadb-server-10.5.links
+++ b/debian/mariadb-server-10.5.links
@@ -1,9 +1,10 @@
-usr/bin/mysql_convert_table_format usr/bin/mariadb-convert-table-format
-usr/bin/mysql_secure_installation usr/bin/mariadb-secure-installation
-usr/bin/mysql_setpermission usr/bin/mariadb-setpermission
-usr/bin/mysql_tzinfo_to_sql usr/bin/mariadb-tzinfo-to-sql
-usr/bin/mysqld_multi usr/bin/mariadbd-multi
-usr/bin/mysqld_safe usr/bin/mariadbd-safe
-usr/bin/mysqld_safe_helper usr/bin/mariadbd-safe-helper
-usr/bin/mysqlhotcopy usr/bin/mariadb-hotcopy
-usr/bin/mysqlshow usr/bin/mariadb-show
+usr/bin/mariadb-binlog usr/bin/mysqlbinlog
+usr/bin/mariadb-convert-table-format usr/bin/mysql_convert_table_format
+usr/bin/mariadb-hotcopy usr/bin/mysqlhotcopy
+usr/bin/mariadb-plugin usr/bin/mysql_plugin
+usr/bin/mariadb-secure-installation usr/bin/mysql_secure_installation
+usr/bin/mariadb-setpermission usr/bin/mysql_setpermission
+usr/bin/mariadb-tzinfo-to-sql usr/bin/mysql_tzinfo_to_sql
+usr/bin/mariadbd-multi usr/bin/mysqld_multi
+usr/bin/mariadbd-safe usr/bin/mysqld_safe
+usr/bin/mariadbd-safe-helper usr/bin/mysqld_safe_helper
diff --git a/debian/mariadb-server-core-10.5.install b/debian/mariadb-server-core-10.5.install
index a8acdfa6300..133aad20b74 100644
--- a/debian/mariadb-server-core-10.5.install
+++ b/debian/mariadb-server-core-10.5.install
@@ -1,15 +1,15 @@
 usr/bin/innochecksum
+usr/bin/mariadb-install-db
+usr/bin/mariadb-upgrade
 usr/bin/my_print_defaults
-usr/bin/mysql_install_db
-usr/bin/mysql_upgrade
-usr/sbin/mysqld
+usr/sbin/mariadbd
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mariadb-install-db.1
 usr/share/man/man1/mariadb-upgrade.1
+usr/share/man/man8/mariadbd.8
 usr/share/man/man1/my_print_defaults.1
 usr/share/man/man1/mysql_install_db.1
 usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man8/mariadbd.8
 usr/share/man/man8/mysqld.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
diff --git a/debian/mariadb-server-core-10.5.links b/debian/mariadb-server-core-10.5.links
index b7873f93141..c2be98f38fb 100644
--- a/debian/mariadb-server-core-10.5.links
+++ b/debian/mariadb-server-core-10.5.links
@@ -1,3 +1,3 @@
-usr/bin/mysql_install_db usr/bin/mariadb-install-db
-usr/bin/mysql_upgrade usr/bin/mariadb-upgrade
-usr/sbin/mysqld usr/sbin/mariadbd
+usr/bin/mariadb-install-db usr/bin/mysql_install_db
+usr/bin/mariadb-upgrade usr/bin/mysql_upgrade
+usr/sbin/mariadbd usr/sbin/mysqld
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index fc7a707c007..7a0ed767bad 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -1,7 +1,7 @@
-usr/bin/mysql_client_test
-usr/bin/mysql_client_test_embedded
-usr/bin/mysqltest
-usr/bin/mysqltest_embedded
+usr/bin/mariadb-client-test
+usr/bin/mariadb-client-test-embedded
+usr/bin/mariadb-test
+usr/bin/mariadb-test-embedded
 usr/lib/mysql/plugin/adt_null.so
 usr/lib/mysql/plugin/auth_0x0100.so
 usr/lib/mysql/plugin/auth_test_plugin.so
@@ -17,10 +17,10 @@ usr/lib/mysql/plugin/qa_auth_client.so
 usr/lib/mysql/plugin/qa_auth_interface.so
 usr/lib/mysql/plugin/qa_auth_server.so
 usr/lib/mysql/plugin/test_versioning.so
-usr/share/man/man1/mariadb-client-test-embedded.1
 usr/share/man/man1/mariadb-client-test.1
-usr/share/man/man1/mariadb-test-embedded.1
+usr/share/man/man1/mariadb-client-test-embedded.1
 usr/share/man/man1/mariadb-test.1
+usr/share/man/man1/mariadb-test-embedded.1
 usr/share/man/man1/mysql-stress-test.pl.1
 usr/share/man/man1/mysql-test-run.pl.1
 usr/share/man/man1/mysql_client_test.1
diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links
index 504e0a0b557..718a5355474 100644
--- a/debian/mariadb-test.links
+++ b/debian/mariadb-test.links
@@ -1,6 +1,6 @@
-usr/bin/mysql_client_test usr/bin/mariadb-client-test
-usr/bin/mysql_client_test_embedded usr/bin/mariadb-client-test-embedded
-usr/bin/mysqltest usr/bin/mariadb-test
-usr/bin/mysqltest_embedded usr/bin/mariadb-test-embedded
+usr/bin/mariadb-client-test usr/bin/mysql_client_test
+usr/bin/mariadb-client-test-embedded usr/bin/mysql_client_test_embedded
+usr/bin/mariadb-test usr/bin/mysqltest
+usr/bin/mariadb-test-embedded usr/bin/mysqltest_embedded
 usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
 usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run