MDEV-30203: create compat packagesbb-11.0-danielblack-MDEV-30203-pkgtest-symlink-packages

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.

resolve-stack-dump was moved from server to client (RPM), like
where the man page and Debian package put it.

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.

Plugins now can have their own manual pages, as has been
done for rocksdb and s3.

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

Additionally, without WSREP, no galera man pages are
installed.

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

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

16 files changed, 247 insertions, 97 deletions

diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 339363b2169..e53845c201c 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -17,6 +17,7 @@ SET(CPACK_COMPONENT_SUPPORTFILES_GROUP "server")
 SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "devel")
 SET(CPACK_COMPONENT_MANPAGESDEVELOPMENT_GROUP "devel")
 SET(CPACK_COMPONENT_TEST_GROUP "test")
+SET(CPACK_COMPONENT_TESTSYMLINKS_GROUP "test")
 SET(CPACK_COMPONENT_MANPAGESTEST_GROUP "test")
 SET(CPACK_COMPONENT_CLIENT_GROUP "client")
 SET(CPACK_COMPONENT_MANPAGESCLIENT_GROUP "client")
@@ -26,12 +27,14 @@ SET(CPACK_COMPONENT_COMMON_GROUP "common")
 SET(CPACK_COMPONENT_CLIENTPLUGINS_GROUP "common")
 SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
 SET(CPACK_COMPONENT_BACKUP_GROUP "backup")
+SET(CPACK_COMPONENT_BACKUPSYMLINKS_GROUP "backup")
+SET(CPACK_COMPONENT_MANPAGESBACKUP_GROUP "backup")
 
 SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
                          SupportFiles Development ManPagesDevelopment
-                         ManPagesTest Readme ManPagesClient Test
+                         ManPagesTest Readme ManPagesClient Test TestSymlinks
                          Common Client SharedLibraries ClientPlugins
-                         backup
+                         backup backupSymlinks ManPagesBackup
 )
 
 SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
@@ -179,6 +182,24 @@ MACRO(SETA var)
   ENDFOREACH()
 ENDMACRO(SETA)
 
+FOREACH(SYM_COMPONENT Server Client)
+  STRING(TOLOWER ${SYM_COMPONENT}-compat SYM)
+  SET(SYMCOMP ${SYM_COMPONENT}Symlinks)
+  STRING(TOUPPER ${SYMCOMP} SYMCOMP_UPPER)
+  SET(CPACK_COMPONENT_${SYMCOMP_UPPER}_GROUP "${SYM}")
+  SET(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL}" "${SYMCOMP}")
+  SET(CPACK_RPM_${SYM}_PACKAGE_SUMMARY "MySQL compatible symlinks for MariaDB database ${SYM_COMPONENT} binaries/scripts")
+  SET(CPACK_RPM_${SYM}_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
+  SET(CPACK_RPM_${SYM}_PACKAGE_ARCHITECTURE "noarch")
+  SET(CPACK_RPM_${SYM}_USER_FILELIST ${ignored})
+  STRING(TOLOWER ${SYM_COMPONENT} SYM_COMPONENT_LOWER)
+  SET(CPACK_RPM_${SYM}_PACKAGE_REQUIRES "MariaDB-${SYM_COMPONENT_LOWER} >= 11.0.0")
+  SETA(CPACK_RPM_${SYM_COMPONENT_LOWER}_PACKAGE_RECOMMENDS "MariaDB-${SYM}")
+ENDFOREACH()
+
+SETA(CPACK_RPM_client_symlinks_PACKAGE_CONFLICTS
+  "MariaDB-server < 11.0.0")
+
 SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
   "mysql-client"
   "MySQL-client"
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake
index 06bdfce14de..f9faabab9cd 100644
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
@@ -106,7 +106,7 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${link}
          DESTINATION
          ${ARG_DESTINATION}
-         COMPONENT ${COMP})
+         COMPONENT ${COMP}Symlinks)
     ELSE()
       # Windows note:
       # Here, hardlinks are used, because cmake can't install symlinks.
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 813d8ef6e42..d3f214c6146 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -250,7 +250,10 @@ MACRO(MYSQL_ADD_PLUGIN)
         ELSE()
           SET(ver "")
         ENDIF()
-        SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT})
+        STRING(TOUPPER ${ARG_COMPONENT} ARG_COMPONENT_UPPER)
+        SET(CPACK_COMPONENT_${ARG_COMPONENT_UPPER}SYMLINKS_GROUP ${ARG_COMPONENT} PARENT_SCOPE)
+        SET(CPACK_COMPONENT_${ARG_COMPONENT_UPPER}_GROUP ${ARG_COMPONENT} PARENT_SCOPE)
+        SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} ${ARG_COMPONENT}Symlinks)
         SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
 
         IF (NOT ARG_CLIENT)
diff --git a/debian/control b/debian/control
index f5b6c3b762a..9f1b0070a32 100644
--- a/debian/control
+++ b/debian/control
@@ -546,7 +546,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
@@ -556,6 +557,66 @@ 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,
+           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}),
@@ -671,7 +732,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})
@@ -777,6 +839,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 1a07a3fea94..e8db65954a3 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/chinese
 usr/share/mysql/charsets
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
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 5021128ed35..34a83d19e32 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -91,7 +91,7 @@ MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
 TARGET_LINK_LIBRARIES(replace mysys)
 
 IF(UNIX)
-  MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
+  MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c COMPONENT Client)
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
 
   MYSQL_ADD_EXECUTABLE(mariadb-waitpid mysql_waitpid.c COMPONENT Client)
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index e6d7ab32e88..15ba11c2b5e 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -13,45 +13,54 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
 
-SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1
-    wsrep_sst_mysqldump.1 wsrep_sst_rsync_wan.1 galera_recovery.1 galera_new_cluster.1)
-SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1
-                aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1
-                aria_s3_copy.1
-		myisamlog.1 myisampack.1 mysql.server.1 mariadb-conv.1
-		mysql_fix_extensions.1
-		mysql_install_db.1
-		mysql_upgrade.1
-		mysqld_multi.1 mysqld_safe.1
-		resolveip.1 mariadb-service-convert.1
-		mysqld_safe_helper.1
-		mysql_ldb.1 myrocks_hotbackup.1
-		mbstream.1 mariabackup.1)
 IF(WITH_WSREP)
-  SET(MAN1_SERVER ${MAN1_SERVER} ${MAN1_WSREP})
+  SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1
+      wsrep_sst_mysqldump.1 wsrep_sst_rsync_wan.1 galera_recovery.1 galera_new_cluster.1)
 ENDIF()
+SET(MAN1_SERVER_COMPAT mysql.server.1
+                       mysql_fix_extensions.1
+                       mysql_install_db.1
+                       mysql_upgrade.1
+                       mysqld_multi.1 mysqld_safe.1
+                       mysqld_safe_helper.1)
+SET(MAN1_SERVER_NATIVE innochecksum.1 myisam_ftdump.1 myisamchk.1
+                       aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1
+                       myisamlog.1 myisampack.1  mariadb-conv.1
+                       resolveip.1 mariadb-service-convert.1)
+SET(MAN1_SERVER ${MAN1_SERVER_COMPAT} ${MAN1_SERVER_NATIVE})
 SET(MAN8_SERVER mysqld.8)
-SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
-		mysqldumpslow.1
-		mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
-		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mytop.1
-                mysql_plugin.1 mysql_embedded.1 my_print_defaults.1
-                mysqlhotcopy.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1
-                mysql_convert_table_format.1 replace.1 mysql_secure_installation.1
-		perror.1 resolve_stack_dump.1)
+SET(MAN1_CLIENT_NATIVE msql2mysql.1 perror.1 replace.1 resolve_stack_dump.1 mytop.1 my_print_defaults.1)
+SET(MAN1_CLIENT_COMPAT mysql.1 mysql_find_rows.1 mysql_waitpid.1
+                       mysqldumpslow.1
+                       mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
+                       mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
+                       mysql_plugin.1 mysql_embedded.1
+                       mysqlhotcopy.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1
+                       mysql_convert_table_format.1 mysql_secure_installation.1)
+SET(MAN1_CLIENT ${MAN1_CLIENT_NATIVE} ${MAN1_CLIENT_COMPAT})
 SET(MAN1_DEVEL mysql_config.1)
-SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
-              mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1
-              my_safe_process.1)
+SET(MAN1_TEST my_safe_process.1
+              mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
+              mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1)
 IF(NOT WITHOUT_SERVER)
-  INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
-  INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
+  INSTALL(FILES ${MAN1_SERVER_NATIVE} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
+  IF (WITH_WSREP)
+    INSTALL(FILES ${MAN1_WSREP} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
+  ENDIF()
+  INSTALL(FILES ${MAN1_SERVER_COMPAT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ServerSymlinks)
+  INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ServerSymlinks)
 ENDIF()
+SET(MAN1_BACKUP mbstream.1 mariabackup.1)
+INSTALL(FILES ${MAN1_BACKUP} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT backup)
 
-INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
+INSTALL(FILES ${MAN1_CLIENT_NATIVE} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
+INSTALL(FILES ${MAN1_CLIENT_COMPAT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ClientSymlinks)
 INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
 INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
 
+INSTALL(FILES mysql_ldb.1 myrocks_hotbackup.1 DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT rocksdb-engine)
+INSTALL(FILES aria_s3_copy.1 DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT s3-engine)
+
 macro(MARIADB_SYMLINK_MANPAGE)
   list(LENGTH MARIADB_SYMLINK_TOS _len)
   math(EXPR _listlen "${_len}-1")
@@ -65,6 +74,7 @@ macro(MARIADB_SYMLINK_MANPAGE)
     list(FIND MAN1_CLIENT ${_manname}.1 _iman1client)
     list(FIND MAN1_DEVEL ${_manname}.1 _iman1devel)
     list(FIND MAN1_TEST ${_manname}.1 _iman1test)
+    list(FIND MAN1_BACKUP ${_manname}.1 _iman1backup)
 
     if (${_iman1client} GREATER -1)
       MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesClient)
@@ -75,6 +85,9 @@ macro(MARIADB_SYMLINK_MANPAGE)
     if (${_iman1test} GREATER -1)
       MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesTest)
     endif()
+    if (${_iman1backup} GREATER -1)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesBackup)
+    endif()
     if (WITHOUT_SERVER)
 	    continue()
     endif()
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9eec793c9fb..7f9c92f1cf2 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -223,7 +223,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
     DESTINATION ${INSTALL_SCRIPTDIR}
     COMPONENT Server)
 
-  INSTALL_LINK(mariadb-install-db mysql_install_db ${INSTALL_SCRIPTDIR} Server)
+  INSTALL_LINK(mariadb-install-db mysql_install_db ${INSTALL_SCRIPTDIR} ServerSymlinks)
 ENDIF()
 
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
@@ -385,7 +385,7 @@ ELSE()
 
     # Create symlink
     IF (NOT ${binname} STREQUAL ${file})
-      INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
+      INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT}Symlinks)
     ENDIF()
   ENDFOREACH()
 ENDIF()
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index ebb138c70f0..399c59d57d7 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -28,6 +28,10 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
     add_subdirectory(columnstore)
 
     IF(TARGET columnstore)
+	# Redo logic in cmake/plugin to prevent the attempted creation of *Symlinks package
+	SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} columnstore-engineSymlinks)
+	SET(CPACK_COMPONENT_COLUMNSTORE-ENGINESYMLINKS_GROUP columnstore-engine PARENT_SCOPE)
+        SET(CPACK_COMPONENT_COLUMNSTORE-ENGINE_GROUP columnstore-engine PARENT_SCOPE)
         # Needed to bump the component changes up to the main scope
         APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)
         IF (RPM)