Revert "MDEV-21303 Make executables MariaDB named"

This reverts commit 5d1b8f4152.

because since 306e439c6d manpages use troff aliases
instead of symlinks, so they should not be symlinked.

16 files changed, 33 insertions, 33 deletions

diff --git a/debian/libmariadb-dev-compat.links b/debian/libmariadb-dev-compat.links
index 33dfd678d42..e02260c0129 100755
--- a/debian/libmariadb-dev-compat.links
+++ b/debian/libmariadb-dev-compat.links
@@ -2,4 +2,3 @@
 usr/bin/mariadb_config usr/bin/mysql_config
 usr/include/mariadb usr/include/mysql
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc
-usr/share/man/man1/mariadb-config.1 usr/share/man/man1/mysql_config.1
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index 7c0ed69718f..2d27bda07ab 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -6,4 +6,5 @@ usr/lib/*/libmariadbclient.so
 usr/lib/*/libmysqlservices.a
 usr/lib/*/pkgconfig/mariadb.pc
 usr/share/aclocal/mysql.m4
-usr/share/man/man1/mariadb-config.1
+usr/share/man/man1/mysql_config.1
+usr/share/man/man1/mariadb-config.1
\ No newline at end of file
diff --git a/debian/mariadb-backup.install b/debian/mariadb-backup.install
index a288377ddd0..b332b8724d5 100644
--- a/debian/mariadb-backup.install
+++ b/debian/mariadb-backup.install
@@ -1,4 +1,5 @@
 usr/bin/mariadb-backup
 usr/bin/mbstream
+usr/share/man/man1/mariabackup.1
 usr/share/man/man1/mariadb-backup.1
 usr/share/man/man1/mbstream.1
diff --git a/debian/mariadb-backup.links b/debian/mariadb-backup.links
index 954c839cf10..924b476393b 100644
--- a/debian/mariadb-backup.links
+++ b/debian/mariadb-backup.links
@@ -1,2 +1 @@
 usr/bin/mariadb-backup usr/bin/mariabackup
-usr/share/man/man1/mariadb-backup.1 usr/share/man/man1/mariabackup.1
diff --git a/debian/mariadb-client-10.5.install b/debian/mariadb-client-10.5.install
index 50482fb8b14..eba63ad76cd 100644
--- a/debian/mariadb-client-10.5.install
+++ b/debian/mariadb-client-10.5.install
@@ -22,4 +22,14 @@ usr/share/man/man1/mariadb-import.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
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysql_waitpid.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
 usr/share/man/man1/mytop.1
diff --git a/debian/mariadb-client-10.5.links b/debian/mariadb-client-10.5.links
index 3aaf440724a..85b2c73a30b 100644
--- a/debian/mariadb-client-10.5.links
+++ b/debian/mariadb-client-10.5.links
@@ -21,13 +21,3 @@ 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
-usr/share/man/man1/mariadb-access.1 usr/share/man/man1/mysqlaccess.1
-usr/share/man/man1/mariadb-admin.1 usr/share/man/man1/mysqladmin.1
-usr/share/man/man1/mariadb-dump.1 usr/share/man/man1/mysqldump.1
-usr/share/man/man1/mariadb-dumpslow.1 usr/share/man/man1/mysqldumpslow.1
-usr/share/man/man1/mariadb-find-rows.1 usr/share/man/man1/mysql_find_rows.1
-usr/share/man/man1/mariadb-fix-extensions.1 usr/share/man/man1/mysql_fix_extensions.1
-usr/share/man/man1/mariadb-import.1 usr/share/man/man1/mysqlimport.1
-usr/share/man/man1/mariadb-show.1 usr/share/man/man1/mysqlshow.1
-usr/share/man/man1/mariadb-slap.1 usr/share/man/man1/mysqlslap.1
-usr/share/man/man1/mariadb-waitpid.1 usr/share/man/man1/mysql_waitpid.1
diff --git a/debian/mariadb-client-core-10.5.install b/debian/mariadb-client-core-10.5.install
index bb96e05152e..224e324b704 100644
--- a/debian/mariadb-client-core-10.5.install
+++ b/debian/mariadb-client-core-10.5.install
@@ -2,3 +2,5 @@ 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
+usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-client-core-10.5.links b/debian/mariadb-client-core-10.5.links
index ce6b296a954..343cf6ff78b 100644
--- a/debian/mariadb-client-core-10.5.links
+++ b/debian/mariadb-client-core-10.5.links
@@ -1,4 +1,2 @@
 usr/bin/mariadb usr/bin/mysql
 usr/bin/mariadb-check usr/bin/mysqlcheck
-usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqlcheck.1
-usr/share/man/man1/mariadb.1 usr/share/man/man1/mysql.1
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
index fdce65cf8ef..dbfd246024b 100644
--- a/debian/mariadb-plugin-rocksdb.install
+++ b/debian/mariadb-plugin-rocksdb.install
@@ -4,3 +4,4 @@ usr/bin/myrocks_hotbackup
 usr/lib/mysql/plugin/ha_rocksdb.so
 usr/share/man/man1/mariadb-ldb.1
 usr/share/man/man1/myrocks_hotbackup.1
+usr/share/man/man1/mysql_ldb.1
diff --git a/debian/mariadb-plugin-rocksdb.links b/debian/mariadb-plugin-rocksdb.links
index 78d9ce5ac50..d24682a5a66 100644
--- a/debian/mariadb-plugin-rocksdb.links
+++ b/debian/mariadb-plugin-rocksdb.links
@@ -1,2 +1 @@
 usr/bin/mariadb-ldb usr/bin/mysql_ldb
-usr/share/man/man1/mariadb-ldb.1 usr/share/man/man1/mysql_ldb.1
diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.5.install
index fd98f72ae7d..bd550987197 100644
--- a/debian/mariadb-server-10.5.install
+++ b/debian/mariadb-server-10.5.install
@@ -83,6 +83,16 @@ usr/share/man/man1/myisam_ftdump.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisamlog.1
 usr/share/man/man1/myisampack.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysql_plugin.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqld_safe_helper.1
+usr/share/man/man1/mysqlhotcopy.1
 usr/share/man/man1/perror.1
 usr/share/man/man1/replace.1
 usr/share/man/man1/resolve_stack_dump.1
diff --git a/debian/mariadb-server-10.5.links b/debian/mariadb-server-10.5.links
index 3dcd08d372e..9cc3a436ba8 100644
--- a/debian/mariadb-server-10.5.links
+++ b/debian/mariadb-server-10.5.links
@@ -8,13 +8,3 @@ 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
-usr/share/man/man1/mariadb-convert-table-format.1 usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mariadb-plugin.1 usr/share/man/man1/mysql_plugin.1
-usr/share/man/man1/mariadb-secure-installation.1 usr/share/man/man1/mysql_secure_installation.1
-usr/share/man/man1/mariadb-setpermission.1 usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mariadb-tzinfo-to-sql.1 usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/man/man1/mariadb-binlog.1 usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mariadbd-multi.1 usr/share/man/man1/mysqld_multi.1
-usr/share/man/man1/mariadbd-safe.1 usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mariadbd-safe-helper.1 usr/share/man/man1/mysqld_safe_helper.1
-usr/share/man/man1/mariadb-hotcopy.1 usr/share/man/man1/mysqlhotcopy.1
diff --git a/debian/mariadb-server-core-10.5.install b/debian/mariadb-server-core-10.5.install
index 3f7093a296a..133aad20b74 100644
--- a/debian/mariadb-server-core-10.5.install
+++ b/debian/mariadb-server-core-10.5.install
@@ -8,6 +8,9 @@ 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/mysqld.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
 usr/share/mysql/danish
diff --git a/debian/mariadb-server-core-10.5.links b/debian/mariadb-server-core-10.5.links
index 2729efd6543..c2be98f38fb 100644
--- a/debian/mariadb-server-core-10.5.links
+++ b/debian/mariadb-server-core-10.5.links
@@ -1,6 +1,3 @@
 usr/bin/mariadb-install-db usr/bin/mysql_install_db
 usr/bin/mariadb-upgrade usr/bin/mysql_upgrade
 usr/sbin/mariadbd usr/sbin/mysqld
-usr/share/man/man1/mariadb-install-db.1 usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mariadb-upgrade.1 usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man8/mariadbd.8 usr/share/man/man8/mysqld.8
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index 83733096b83..7a0ed767bad 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -23,6 +23,10 @@ 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
+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
diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links
index e009f2b88d0..718a5355474 100644
--- a/debian/mariadb-test.links
+++ b/debian/mariadb-test.links
@@ -4,7 +4,3 @@ 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
-usr/share/man/man1/mariadb-client-test.1 usr/share/man/man1/mysql_client_test.1
-usr/share/man/man1/mariadb-client-test.1 usr/share/man/man1/mysql_client_test_embedded.1
-usr/share/man/man1/mariadb-client-test.1 usr/share/man/man1/mysqltest.1
-usr/share/man/man1/mariadb-test-embedded.1 usr/share/man/man1/mysqltest_embedded.1