MDEV-30203 Move mysql symlinks to different package

For both Deb and RPM, create mariadb-client-compat and
mariadb-server-compat containing the mysql links to the mariadb
named executables/scripts.

The mariadb-client-core mysqlcheck was moved to mariadb-client-compat.

The symlinks in MYSQL_ADD_EXECUTABLE is tagged as a
{Client,Server}Symlinks component and placed in
the symlinks packages.

Man pages are restructured be installed into compat package
if that matches the executable.

Columnstore has a workaround as it doesn't use the cmake/plugin.cmake.

Scripts likewise have compatibility symlinks are in
the {server,client}-compat packages.

Co-author: Andrew Hutchings <andrew@linuxjedi.co.uk>

Closes #2390

9 files changed, 185 insertions, 61 deletions

diff --git a/debian/control b/debian/control
index 91766d64b3e..ae4b5e3ba95 100644
--- a/debian/control
+++ b/debian/control
@@ -544,7 +544,8 @@ Provides: default-mysql-client,
           virtual-mysql-client
 Recommends: libdbd-mariadb-perl | libdbd-mysql-perl,
             libdbi-perl,
-            libterm-readkey-perl
+            libterm-readkey-perl,
+            mariadb-client-compat
 Description: MariaDB database client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -554,6 +555,81 @@ Description: MariaDB database client binaries
  This package includes the client binaries and the additional tools
  innotop and mariadb-report (mysqlreport).
 
+Package: mariadb-client-compat
+Architecture: all
+Depends: mariadb-client (>= ${source:Version})
+Multi-Arch: foreign
+Description: MySQL compatibility links to mariadb-client binaries/scripts.
+Conflicts: mariadb-client (< 11.0.0),
+           mariadb-client-10.0,
+           mariadb-client-10.1,
+           mariadb-client-10.2,
+           mariadb-client-10.3,
+           mariadb-client-10.4,
+           mariadb-client-10.5,
+           mariadb-client-10.6,
+           mariadb-client-10.7,
+           mariadb-client-10.8,
+           mariadb-client-5.1,
+           mariadb-client-5.2,
+           mariadb-client-5.3,
+           mariadb-client-5.5,
+           mariadb-client-core (< 11.0.0),
+           mariadb-client-core-10.0,
+           mariadb-client-core-10.1,
+           mariadb-client-core-10.2,
+           mariadb-client-core-10.3,
+           mariadb-client-core-10.4,
+           mariadb-client-core-10.5,
+           mariadb-client-core-10.6,
+           mariadb-client-core-10.7,
+           mariadb-client-core-10.8,
+           mariadb-client-core-5.1,
+           mariadb-client-core-5.2,
+           mariadb-client-core-5.3,
+           mariadb-client-core-5.5,
+           mysql-client (<< 5.0.51),
+           mysql-client (<< 5.0.51),
+           mysql-client-5.0,
+           mysql-client-5.1,
+           mysql-client-5.5,
+           mysql-client-5.6,
+           mysql-client-5.7,
+           mysql-client-8.0,
+           mysql-client-core-5.0,
+           mysql-client-core-5.1,
+           mysql-client-core-5.5,
+           mysql-client-core-5.6,
+           mysql-client-core-5.7,
+           mysql-client-core-8.0,
+           mariadb-server (< 11.0.0),
+           mariadb-server-10.0,
+           mariadb-server-10.1,
+           mariadb-server-10.2,
+           mariadb-server-10.3,
+           mariadb-server-10.4,
+           mariadb-server-10.5,
+           mariadb-server-10.6,
+           mariadb-server-10.7,
+           mariadb-server-10.8,
+           mariadb-server-core (< 11.0.0),
+           mariadb-server-core-10.0,
+           mariadb-server-core-10.1,
+           mariadb-server-core-10.2,
+           mariadb-server-core-10.3,
+           mariadb-server-core-10.4,
+           mariadb-server-core-10.5,
+           mariadb-server-core-10.6,
+           mariadb-server-core-10.7,
+           mariadb-server-core-10.8,
+           mysql-server-core-8.0,
+           mysql-server-5.7,
+           percona-server-server-5.6,
+           percona-server-server,
+           percona-xtradb-cluster-server-5.6,
+           percona-xtradb-cluster-server-5.7,
+           percona-xtradb-cluster-server
+
 Package: mariadb-server-core
 Architecture: any
 Depends: mariadb-common (>= ${source:Version}),
@@ -668,7 +744,8 @@ Suggests: mailx,
           mariadb-test,
           netcat-openbsd
 Recommends: libhtml-template-perl,
-            pv
+            pv,
+            mariadb-server-compat
 Pre-Depends: adduser (>= 3.40),
              debconf,
              mariadb-common (>= ${source:Version})
@@ -772,6 +849,53 @@ Description: MariaDB database server binaries
  .
  This package includes the server binaries.
 
+Package: mariadb-server-compat
+Architecture: all
+Depends: mariadb-server (>= ${source:Version}),
+Multi-Arch: foreign
+Description: MySQL compatibility links to mariadb-server binaries/scripts.
+Conflicts: mariadb-server-core (< 11.0.0),
+           mariadb-server-core-10.0,
+           mariadb-server-core-10.1,
+           mariadb-server-core-10.2,
+           mariadb-server-core-10.3,
+           mariadb-server-core-10.4,
+           mariadb-server-core-10.5,
+           mariadb-server-core-10.6,
+           mariadb-server-core-10.7,
+           mariadb-server-core-10.8,
+           mariadb-server-core-5.1,
+           mariadb-server-core-5.2,
+           mariadb-server-core-5.3,
+           mariadb-server-core-5.5,
+           mariadb-server (< 11.0.0),
+           mariadb-server-10.0,
+           mariadb-server-10.1,
+           mariadb-server-10.2,
+           mariadb-server-10.3,
+           mariadb-server-10.4,
+           mariadb-server-10.5,
+           mariadb-server-10.6,
+           mariadb-server-10.7,
+           mariadb-server-10.8,
+           mariadb-server-5.1,
+           mariadb-server-5.2,
+           mariadb-server-5.3,
+           mariadb-server-5.5,
+           mysql-server-5.0,
+           mysql-server-core-5.0,
+           mysql-server-core-5.1,
+           mysql-server-core-5.5,
+           mysql-server-core-5.6,
+           mysql-server-core-5.7,
+           mysql-server-core-8.0,
+           percona-server-server-5.6,
+           percona-server-server-5.7,
+           percona-server-server,
+           percona-xtradb-cluster-server-5.6,
+           percona-xtradb-cluster-server-5.7,
+           percona-xtradb-cluster-server
+
 Package: mariadb-backup
 Architecture: any
 Breaks: mariadb-backup-10.1,
diff --git a/debian/mariadb-client-compat.install b/debian/mariadb-client-compat.install
new file mode 100644
index 00000000000..4800fc3a720
--- /dev/null
+++ b/debian/mariadb-client-compat.install
@@ -0,0 +1,38 @@
+usr/bin/mysql
+usr/bin/mysqlbinlog
+usr/bin/mysql_convert_table_format
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysql_plugin
+usr/bin/mysql_setpermission
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_waitpid
+usr/bin/mysqlaccess
+usr/bin/mysqladmin
+usr/bin/mysqlcheck
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysqlhotcopy
+usr/bin/mysqlimport
+usr/bin/mysql_secure_installation
+usr/bin/mysqlshow
+usr/bin/mysqlslap
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.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/mysql_waitpid.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-client-compat.links b/debian/mariadb-client-compat.links
new file mode 100644
index 00000000000..a661ee26104
--- /dev/null
+++ b/debian/mariadb-client-compat.links
@@ -0,0 +1,9 @@
+usr/bin/mariadb-check usr/bin/mysqlanalyze
+usr/bin/mariadb-check usr/bin/mysqlcheck
+usr/bin/mariadb-check usr/bin/mysqloptimize
+usr/bin/mariadb-check usr/bin/mysqlrepair
+usr/bin/mariadb-report usr/bin/mysqlreport
+usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlanalyze.1.gz
+usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqloptimize.1.gz
+usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlrepair.1.gz
+usr/share/man/man1/mariadb-report.1.gz usr/share/man/man1/mysqlreport.1.gz
diff --git a/debian/mariadb-client-core.install b/debian/mariadb-client-core.install
index bcc3515a02f..ddb8015e1cb 100644
--- a/debian/mariadb-client-core.install
+++ b/debian/mariadb-client-core.install
@@ -1,9 +1,6 @@
 usr/bin/mariadb
 usr/bin/mariadb-check
 usr/bin/my_print_defaults
-usr/bin/mysql
 usr/share/man/man1/mariadb-check.1
 usr/share/man/man1/mariadb.1
 usr/share/man/man1/my_print_defaults.1
-usr/share/man/man1/mysql.1
-usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-client.install b/debian/mariadb-client.install
index fba8d093810..d1b62570f9a 100644
--- a/debian/mariadb-client.install
+++ b/debian/mariadb-client.install
@@ -22,17 +22,6 @@ usr/bin/mariadb-slap
 usr/bin/mariadb-tzinfo-to-sql
 usr/bin/mariadb-waitpid
 usr/bin/msql2mysql
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
-usr/bin/mysql_waitpid
-usr/bin/mysqlaccess
-usr/bin/mysqladmin
-usr/bin/mysqlcheck
-usr/bin/mysqldump
-usr/bin/mysqldumpslow
-usr/bin/mysqlimport
-usr/bin/mysqlshow
-usr/bin/mysqlslap
 usr/bin/mytop
 usr/bin/perror
 usr/bin/replace
@@ -56,23 +45,6 @@ usr/share/man/man1/mariadb-slap.1
 usr/share/man/man1/mariadb-tzinfo-to-sql.1
 usr/share/man/man1/mariadb-waitpid.1
 usr/share/man/man1/msql2mysql.1
-usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mysql_find_rows.1
-usr/share/man/man1/mysql_fix_extensions.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/mysql_waitpid.1
-usr/share/man/man1/mysqlaccess.1
-usr/share/man/man1/mysqladmin.1
-usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysqldump.1
-usr/share/man/man1/mysqldumpslow.1
-usr/share/man/man1/mysqlhotcopy.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
 usr/share/man/man1/perror.1
 usr/share/man/man1/replace.1
diff --git a/debian/mariadb-client.links b/debian/mariadb-client.links
index 62e3651daf5..c65cb3d42cd 100644
--- a/debian/mariadb-client.links
+++ b/debian/mariadb-client.links
@@ -2,16 +2,7 @@ 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/mariadbcheck
-usr/bin/mariadb-check usr/bin/mysqlanalyze
-usr/bin/mariadb-check usr/bin/mysqlcheck
-usr/bin/mariadb-check usr/bin/mysqloptimize
-usr/bin/mariadb-check usr/bin/mysqlrepair
-usr/bin/mariadb-report usr/bin/mysqlreport
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-analyze.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-optimize.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-repair.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadbcheck.1.gz
-usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlanalyze.1.gz
-usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqloptimize.1.gz
-usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlrepair.1.gz
-usr/share/man/man1/mariadb-report.1.gz usr/share/man/man1/mysqlreport.1.gz
diff --git a/debian/mariadb-server-compat.install b/debian/mariadb-server-compat.install
new file mode 100644
index 00000000000..36701d8e0c6
--- /dev/null
+++ b/debian/mariadb-server-compat.install
@@ -0,0 +1,12 @@
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqld_safe_helper
+usr/bin/mysql_install_db
+usr/bin/mysql_upgrade
+usr/sbin/mysqld
+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/mysql_install_db.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man8/mysqld.8
diff --git a/debian/mariadb-server-core.install b/debian/mariadb-server-core.install
index 4eee370672a..dbfa6246ee1 100644
--- a/debian/mariadb-server-core.install
+++ b/debian/mariadb-server-core.install
@@ -1,19 +1,13 @@
 usr/bin/innochecksum
 usr/bin/mariadb-install-db
 usr/bin/mariadb-upgrade
-usr/bin/mysql_install_db
-usr/bin/mysql_upgrade
 usr/bin/resolveip
 usr/sbin/mariadbd
-usr/sbin/mysqld
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mariadb-install-db.1
 usr/share/man/man1/mariadb-upgrade.1
-usr/share/man/man1/mysql_install_db.1
-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/charsets
 usr/share/mysql/chinese
diff --git a/debian/mariadb-server.install b/debian/mariadb-server.install
index 2350196e9d3..b5246cda0af 100644
--- a/debian/mariadb-server.install
+++ b/debian/mariadb-server.install
@@ -27,16 +27,6 @@ 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/wsrep_sst_common
 usr/bin/wsrep_sst_mariabackup
 usr/bin/wsrep_sst_mysqldump
@@ -80,9 +70,6 @@ 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/mysqld_multi.1
-usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysqld_safe_helper.1
 usr/share/man/man1/wsrep_sst_common.1
 usr/share/man/man1/wsrep_sst_mariabackup.1
 usr/share/man/man1/wsrep_sst_mysqldump.1