20 files changed, 122 insertions, 55 deletions

diff --git a/.gitignore b/.gitignore
index 95aa3ae64d4..66212558955 100644
--- a/.gitignore
+++ b/.gitignore
@@ -524,3 +524,67 @@ compile_commands.json
 # Clion && other JetBrains ides
 .idea
 
+client/mariadb
+client/mariadb-admin
+client/mariadb-binlog
+client/mariadb-check
+client/mariadb-dump
+client/mariadb-import
+client/mariadb-plugin
+client/mariadb-show
+client/mariadb-slap
+client/mariadb-test
+client/mariadb-upgrade
+extra/mariabackup/mariadb-backup
+extra/mariadb-waitpid
+extra/mariadbd-safe-helper
+libmysqld/examples/mariadb-client-test-embedded
+libmysqld/examples/mariadb-embedded
+libmysqld/examples/mariadb-test-embedded
+man/mariadb-access.1
+man/mariadb-admin.1
+man/mariadb-backup.1
+man/mariadb-binlog.1
+man/mariadb-check.1
+man/mariadb-client-test-embedded.1
+man/mariadb-client-test.1
+man/mariadb-convert-table-format.1
+man/mariadb-dump.1
+man/mariadb-dumpslow.1
+man/mariadb-embedded.1
+man/mariadb-find-rows.1
+man/mariadb-fix-extensions.1
+man/mariadb-hotcopy.1
+man/mariadb-import.1
+man/mariadb-install-db.1
+man/mariadb-ldb.1
+man/mariadb-plugin.1
+man/mariadb-secure-installation.1
+man/mariadb-setpermission.1
+man/mariadb-show.1
+man/mariadb-slap.1
+man/mariadb-test-embedded.1
+man/mariadb-test.1
+man/mariadb-tzinfo-to-sql.1
+man/mariadb-upgrade.1
+man/mariadb-waitpid.1
+man/mariadb.1
+man/mariadbd-multi.1
+man/mariadbd-safe-helper.1
+man/mariadbd-safe.1
+man/mariadbd.8
+scripts/mariadb-access
+scripts/mariadb-convert-table-format
+scripts/mariadb-dumpslow
+scripts/mariadb-find-rows
+scripts/mariadb-fix-extensions
+scripts/mariadb-hotcopy
+scripts/mariadb-install-db
+scripts/mariadb-secure-installation
+scripts/mariadb-setpermission
+scripts/mariadbd-multi
+scripts/mariadbd-safe
+sql/mariadb-tzinfo-to-sql
+sql/mariadbd
+storage/rocksdb/mariadb-ldb
+tests/mariadb-client-test
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index a4ba10c28e5..f04ab691af1 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -101,17 +101,13 @@ FUNCTION(INSTALL_SCRIPT)
   IF(NOT ARG_DESTINATION)
     SET(ARG_DESTINATION ${INSTALL_BINDIR})
   ENDIF()
-  IF(ARG_COMPONENT)
-    SET(COMP COMPONENT ${ARG_COMPONENT})
-  ELSE()
-    SET(COMP)
-  ENDIF()
+  SET(COMP ${ARG_COMPONENT})
 
   IF (COMP MATCHES ${SKIP_COMPONENTS})
     RETURN()
   ENDIF()
 
-  INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} ${COMP})
+  INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP})
   get_filename_component(dest "${script}" NAME)
   CREATE_MARIADB_SYMLINK(${dest} ${ARG_DESTINATION} ${COMP})
 
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake
index d894ee2de9a..54fdab7b17c 100644
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
@@ -70,16 +70,16 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
       SET(ARG_DESTINATION ${INSTALL_BINDIR})
     ENDIF()
     IF(ARG_COMPONENT)
-      SET(COMP COMPONENT ${ARG_COMPONENT})
+      SET(COMP ${ARG_COMPONENT})
     ELSEIF(MYSQL_INSTALL_COMPONENT)
-      SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT})
+      SET(COMP ${MYSQL_INSTALL_COMPONENT})
     ELSE()
-      SET(COMP COMPONENT Client)
+      SET(COMP Client)
     ENDIF()
     IF (COMP MATCHES ${SKIP_COMPONENTS})
       RETURN()
     ENDIF()
-    MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
+    MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP})
   ENDIF()
 
   # create mariadb named symlink
diff --git a/cmake/symlinks.cmake b/cmake/symlinks.cmake
index 8fbdc93e869..251532892c2 100644
--- a/cmake/symlinks.cmake
+++ b/cmake/symlinks.cmake
@@ -12,6 +12,7 @@ REGISTER_SYMLINK("mariabackup" "mariadb-backup")
 REGISTER_SYMLINK("mysqlbinlog" "mariadb-binlog")
 REGISTER_SYMLINK("mysqlcheck" "mariadb-check")
 REGISTER_SYMLINK("mysql_client_test_embedded" "mariadb-client-test-embedded")
+REGISTER_SYMLINK("mysql_client_test" "mariadb-client-test")
 REGISTER_SYMLINK("mariadb_config" "mariadb-config")
 REGISTER_SYMLINK("mysql_convert_table_format" "mariadb-convert-table-format")
 REGISTER_SYMLINK("mysqldump" "mariadb-dump")
@@ -30,7 +31,6 @@ REGISTER_SYMLINK("mysqlshow" "mariadb-show")
 REGISTER_SYMLINK("mysqlslap" "mariadb-slap")
 REGISTER_SYMLINK("mysqltest" "mariadb-test")
 REGISTER_SYMLINK("mysqltest_embedded" "mariadb-test-embedded")
-REGISTER_SYMLINK("mytop" "mariadb-top")
 REGISTER_SYMLINK("mysql_tzinfo_to_sql" "mariadb-tzinfo-to-sql")
 REGISTER_SYMLINK("mysql_upgrade" "mariadb-upgrade")
 REGISTER_SYMLINK("mysql_upgrade_service" "mariadb-upgrade-service")
@@ -59,7 +59,7 @@ endmacro(CREATE_MARIADB_SYMLINK)
 macro(CREATE_MARIADB_SYMLINK_IN_DIR src dest dir comp)
   if(UNIX)
     add_custom_target(
-      symlink_${dest}_${comp} ALL
+      SYM_${dest} ALL
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dest}
     )
 
diff --git a/debian/mariadb-backup.install b/debian/mariadb-backup.install
index 734117c92e2..21a32860b0c 100644
--- a/debian/mariadb-backup.install
+++ b/debian/mariadb-backup.install
@@ -1,2 +1,4 @@
 usr/bin/mariabackup
 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
new file mode 100644
index 00000000000..7980ef5e54d
--- /dev/null
+++ b/debian/mariadb-backup.links
@@ -0,0 +1 @@
+usr/bin/mariabackup usr/bin/mariadb-backup
diff --git a/debian/mariadb-client-10.4.install b/debian/mariadb-client-10.4.install
index 945bf77c689..9cb4ee3dede 100644
--- a/debian/mariadb-client-10.4.install
+++ b/debian/mariadb-client-10.4.install
@@ -20,3 +20,14 @@ 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/mariadb-access.1
+usr/share/man/man1/mariadb-admin.1
+usr/share/man/man1/mariadb-binlog.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-slap.1
+usr/share/man/man1/mariadb-waitpid.1
diff --git a/debian/mariadb-client-10.4.links b/debian/mariadb-client-10.4.links
index b93d2d7f8fd..5d966575b76 100644
--- a/debian/mariadb-client-10.4.links
+++ b/debian/mariadb-client-10.4.links
@@ -1,10 +1,9 @@
 usr/bin/mysql_find_rows usr/bin/mariadb-find-rows
-usr/bin/mysql_fix_extensions usr/bin/mariadb-fix-extenstions
+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/mysqlanalyze usr/bin/mariadb-analyze
 usr/bin/mysqlbinlog usr/bin/mariadb-binlog
 usr/bin/mysqlcheck usr/bin/mariadb-analyze
 usr/bin/mysqlcheck usr/bin/mariadb-optimize
@@ -13,32 +12,14 @@ 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-dump-slow
+usr/bin/mysqldumpslow usr/bin/mariadb-dumpslow
 usr/bin/mysqlimport usr/bin/mariadb-import
-usr/bin/mysqloptimize usr/bin/mariadb-optimize
-usr/bin/mysqlrepair usr/bin/mariadb-repair
 usr/bin/mysqlreport usr/bin/mariadb-report
 usr/bin/mysqlslap usr/bin/mariadb-slap
-usr/bin/mysqltest usr/bin/mariadb-test
-usr/share/man/man1/mysql_find_rows.1.gz usr/share/man/man1/mariadb-find-rows.1.gz
-usr/share/man/man1/mysql_fix_extensions.1.gz usr/share/man/man1/mariadb-fix-extensions.1.gz
-usr/share/man/man1/mysql_plugin.1.gz usr/share/man/man1/mariadb-plugin.1.gz
-usr/share/man/man1/mysql_waitpid.1.gz usr/share/man/man1/mariadb-waitpid.1.gz
-usr/share/man/man1/mysqlaccess.1.gz usr/share/man/man1/mariadb-access.1.gz
-usr/share/man/man1/mysqladmin.1.gz usr/share/man/man1/mariadb-admin.1.gz
-usr/share/man/man1/mysqlanalyze.1.gz usr/share/man/man1/mariadb-analyze.1.gz
-usr/share/man/man1/mysqlbinlog.1.gz usr/share/man/man1/mariadb-binlog.1.gz
 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/mysqldump.1.gz usr/share/man/man1/mariadb-dump.1.gz
-usr/share/man/man1/mysqldumpslow.1.gz usr/share/man/man1/mariadb-dump-slow.1.gz
-usr/share/man/man1/mysqlimport.1.gz usr/share/man/man1/mariadb-import.1.gz
-usr/share/man/man1/mysqloptimize.1.gz usr/share/man/man1/mariadb-optimize.1.gz
-usr/share/man/man1/mysqlrepair.1.gz usr/share/man/man1/mariadb-repair.1.gz
 usr/share/man/man1/mysqlreport.1.gz usr/share/man/man1/mariadb-report.1.gz
-usr/share/man/man1/mysqlslap.1.gz usr/share/man/man1/mariadb-slap.1.gz
-usr/share/man/man1/mysqltest.1.gz usr/share/man/man1/mariadb-test.1.gz
diff --git a/debian/mariadb-client-core-10.4.install b/debian/mariadb-client-core-10.4.install
index a2781309439..0706b272e8a 100644
--- a/debian/mariadb-client-core-10.4.install
+++ b/debian/mariadb-client-core-10.4.install
@@ -2,3 +2,5 @@ usr/bin/mysql
 usr/bin/mysqlcheck
 usr/share/man/man1/mysql.1
 usr/share/man/man1/mysqlcheck.1
+usr/share/man/man1/mariadb.1
+usr/share/man/man1/mariadb-check.1
diff --git a/debian/mariadb-client-core-10.4.links b/debian/mariadb-client-core-10.4.links
index 4c5ff23b38b..d889e7164b0 100644
--- a/debian/mariadb-client-core-10.4.links
+++ b/debian/mariadb-client-core-10.4.links
@@ -1,4 +1,2 @@
 usr/bin/mysql usr/bin/mariadb
 usr/bin/mysqlcheck usr/bin/mariadb-check
-usr/share/man/man1/mysql.1.gz usr/share/man/man1/mariadb.1.gz
-usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mariadb-check.1.gz
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
index 403c7f291b6..a2b8b805cdb 100644
--- a/debian/mariadb-plugin-rocksdb.install
+++ b/debian/mariadb-plugin-rocksdb.install
@@ -1,5 +1,7 @@
 etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
 usr/bin/myrocks_hotbackup
 usr/bin/mysql_ldb
+usr/share/man/man1/mariadb-ldb.1
+usr/share/man/man1/mysql_ldb.1
 usr/bin/sst_dump
 usr/lib/mysql/plugin/ha_rocksdb.so
diff --git a/debian/mariadb-plugin-rocksdb.links b/debian/mariadb-plugin-rocksdb.links
new file mode 100644
index 00000000000..78e47d43359
--- /dev/null
+++ b/debian/mariadb-plugin-rocksdb.links
@@ -0,0 +1 @@
+usr/bin/mysql_ldb usr/bin/mariadb-ldb
diff --git a/debian/mariadb-server-10.4.install b/debian/mariadb-server-10.4.install
index bfc5f907d09..6d08243d675 100644
--- a/debian/mariadb-server-10.4.install
+++ b/debian/mariadb-server-10.4.install
@@ -66,7 +66,16 @@ 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-convert-table-format.1
+usr/share/man/man1/mariadb-hotcopy.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
+usr/share/man/man1/mariadbd-safe.1
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/my_print_defaults.1
 usr/share/man/man1/myisam_ftdump.1
diff --git a/debian/mariadb-server-10.4.links b/debian/mariadb-server-10.4.links
index 65e0a6650d5..f2d97460371 100644
--- a/debian/mariadb-server-10.4.links
+++ b/debian/mariadb-server-10.4.links
@@ -2,17 +2,8 @@ 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/mariadb-multi
-usr/bin/mysqld_safe usr/bin/mariadb-safe
-usr/bin/mysqld_safe_helper usr/bin/mariadb-safe-helper
+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/share/man/man1/mysql_convert_table_format.1.gz usr/share/man/man1/mariadb-convert-table-format.1.gz
-usr/share/man/man1/mysql_secure_installation.1.gz usr/share/man/man1/mariadb-secure-installation.1.gz
-usr/share/man/man1/mysql_setpermission.1.gz usr/share/man/man1/mariadb-setpermission.1.gz
-usr/share/man/man1/mysql_tzinfo_to_sql.1.gz usr/share/man/man1/mariadb-tzinfo-to-sql.1.gz
-usr/share/man/man1/mysqld_multi.1.gz usr/share/man/man1/mariadb-multi.1.gz
-usr/share/man/man1/mysqld_safe.1.gz usr/share/man/man1/mariadb-safe.1.gz
-usr/share/man/man1/mysqld_safe_helper.1.gz usr/share/man/man1/mariadb-safe-helper.1.gz
-usr/share/man/man1/mysqlhotcopy.1.gz usr/share/man/man1/mariadb-hotcopy.1.gz
-usr/share/man/man1/mysqlshow.1.gz usr/share/man/man1/mariadb-show.1.gz
diff --git a/debian/mariadb-server-core-10.4.install b/debian/mariadb-server-core-10.4.install
index 46c116b618d..24f967252a2 100644
--- a/debian/mariadb-server-core-10.4.install
+++ b/debian/mariadb-server-core-10.4.install
@@ -6,6 +6,9 @@ usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_install_db.1
 usr/share/man/man1/mysql_upgrade.1
 usr/share/man/man8/mysqld.8
+usr/share/man/man1/mariadb-install-db.1
+usr/share/man/man1/mariadb-upgrade.1
+usr/share/man/man8/mariadbd.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
 usr/share/mysql/danish
diff --git a/debian/mariadb-server-core-10.4.links b/debian/mariadb-server-core-10.4.links
index 90ed9ee01cf..b7873f93141 100644
--- a/debian/mariadb-server-core-10.4.links
+++ b/debian/mariadb-server-core-10.4.links
@@ -1,4 +1,3 @@
 usr/bin/mysql_install_db usr/bin/mariadb-install-db
 usr/bin/mysql_upgrade usr/bin/mariadb-upgrade
-usr/share/man/man1/mysql_install_db.1.gz usr/share/man/man1/mariadb-install-db.1.gz
-usr/share/man/man1/mysql_upgrade.1.gz usr/share/man/man1/mariadb-upgrade-db.1.gz
+usr/sbin/mysqld usr/sbin/mariadbd
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index f715825274c..5d3afda68d4 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -23,6 +23,10 @@ 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/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-test.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 884b25a81da..8b9ca6fe98b 100644
--- a/debian/mariadb-test.links
+++ b/debian/mariadb-test.links
@@ -1,2 +1,6 @@
 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/bin/mysql_client_test_embedded usr/bin/mariadb-client-test-embedded
+usr/bin/mysqltest_embedded usr/bin/mariadb-test-embedded
+usr/bin/mysql_client_test usr/bin/mariadb-client-test
+usr/bin/mysqltest usr/bin/mariadb-test
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index c89d156718d..9ceda0c4c33 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -77,9 +77,10 @@ macro(MARIADB_SYMLINK_MANPAGE)
 endmacro(MARIADB_SYMLINK_MANPAGE)
 
 macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr dir comp)
-  list(GET MARIADB_SYMLINK_TOS ${index} _mariadbname)
-  set(symlinkname "${_mariadbname}.${mannr}")
-  CREATE_MARIADB_SYMLINK_IN_DIR(${mysqlname}.${mannr} ${symlinkname} ${INSTALL_MANDIR}/${dir} ${comp})
+  LIST(GET MARIADB_SYMLINK_TOS ${index} _mariadbname)
+  SET(dest "${CMAKE_CURRENT_BINARY_DIR}/${_mariadbname}.${mannr}")
+  FILE(WRITE ${dest} ".so ${mysqlname}.${mannr}")
+  INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/${dir} COMPONENT ${comp})
 endmacro(MARIADB_SYMLINK_MANPAGE_CREATE)
 
 MARIADB_SYMLINK_MANPAGE()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 917ec458203..cb6c756cfe3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(BEFORE
   ${CMAKE_BINARY_DIR}/libmariadb/include
   ${CMAKE_SOURCE_DIR}/libmariadb/include)
 
-ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
+MYSQL_ADD_EXECUTABLE(mysql_client_test mysql_client_test.c COMPONENT Test)
 SET(CLIENT_LIB mariadbclient mysys)
 
 TARGET_LINK_LIBRARIES(mysql_client_test ${CLIENT_LIB})
@@ -34,8 +34,6 @@ IF(WITH_UNIT_TESTS)
   ADD_DEPENDENCIES(bug25714 GenError ${CLIENT_LIB})
 ENDIF()
 
-INSTALL(TARGETS mysql_client_test DESTINATION ${INSTALL_BINDIR} COMPONENT Test)
-
 CHECK_INCLUDE_FILE(event.h HAVE_EVENT_H)
 FIND_LIBRARY(EVENT_LIBRARY event)
 MARK_AS_ADVANCED(EVENT_LIBRARY)