Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

39 files changed, 50 insertions, 252 deletions

diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 345cb439..4c71ccbf 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -13,86 +13,31 @@
 # 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
-    wsrep_sst_backup.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})
-ENDIF()
-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_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)
 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_MANPAGES(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 myisamlog.1
+    myisampack.1 mysql.server.1 mariadb-conv.1 mariadb-fix-extensions.1
+    mariadb-install-db.1 mariadb-upgrade.1 mariadbd-multi.1 mariadbd-safe.1
+    resolveip.1 mariadb-service-convert.1 mariadbd-safe-helper.1 mariadbd.8)
+  INSTALL_MANPAGES(Backup mbstream.1 mariadb-backup.1)
+  IF(WITH_WSREP)
+    INSTALL_MANPAGES(Server
+      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 wsrep_sst_backup.1)
+  ENDIF()
 ENDIF()
-
-INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
-INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
-INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
-
-macro(MARIADB_SYMLINK_MANPAGE)
-  list(LENGTH MARIADB_SYMLINK_TOS _len)
-  math(EXPR _listlen "${_len}-1")
-
-  foreach(_index RANGE ${_listlen})
-    list(GET MARIADB_SYMLINK_TOS ${_index} _name)
-
-    set(_manname "${_name}")
-    list(FIND MAN1_SERVER ${_manname}.1 _iman1server)
-    list(FIND MAN8_SERVER ${_manname}.8 _iman8server)
-    list(FIND MAN1_CLIENT ${_manname}.1 _iman1client)
-    list(FIND MAN1_DEVEL ${_manname}.1 _iman1devel)
-    list(FIND MAN1_TEST ${_manname}.1 _iman1test)
-
-    if (${_iman1client} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesClient)
-    endif()
-    if (${_iman1devel} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesDevelopment)
-    endif()
-    if (${_iman1test} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesTest)
-    endif()
-    if (WITHOUT_SERVER)
-	    continue()
-    endif()
-    if (${_iman1server} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesServer)
-    endif()
-    if (${_iman8server} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 8 "man8" ManPagesServer)
-    endif()
-  endforeach(_index)
-endmacro(MARIADB_SYMLINK_MANPAGE)
-
-macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr dir comp)
-  LIST(GET MARIADB_SYMLINK_FROMS ${index} _mariadbname)
-  SET(dest "${CMAKE_CURRENT_BINARY_DIR}/${_mariadbname}.${mannr}")
-  FILE(WRITE ${dest} ".so ${dir}/${mysqlname}.${mannr}")
-  INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/${dir} COMPONENT ${comp})
-endmacro(MARIADB_SYMLINK_MANPAGE_CREATE)
-
-MARIADB_SYMLINK_MANPAGE()
+INSTALL_MANPAGES(Client
+  msql2mysql.1 mariadb.1 mariadb-find-rows.1 mariadb-waitpid.1
+  mariadb-dumpslow.1 mariadb-access.1 mariadb-admin.1 mariadb-binlog.1
+  mariadb-check.1 mariadb-dump.1 mariadb-import.1 mariadb-show.1
+  mariadb-slap.1 mytop.1 mariadb-plugin.1 mariadb-embedded.1
+  my_print_defaults.1 mariadb-hotcopy.1 mariadb-setpermission.1
+  mariadb-tzinfo-to-sql.1 mariadb-convert-table-format.1 replace.1
+  mariadb-secure-installation.1 perror.1 resolve_stack_dump.1)
+INSTALL_MANPAGES(Development mariadb_config.1)
+INSTALL_MANPAGES(Test
+  mysql-stress-test.pl.1 mysql-test-run.pl.1 mariadb-client-test.1
+  mariadb-test.1 mariadb-test-embedded.1 mariadb-client-test-embedded.1
+  my_safe_process.1)
diff --git a/man/aria_s3_copy.1 b/man/aria_s3_copy.1
deleted file mode 100644
index 5844d5a7..00000000
--- a/man/aria_s3_copy.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.TH ARIA_S3_COPY "1" "June 2020" "aria_s3_copy Ver 1.0" "User Commands"
-.SH NAME
-aria_s3_copy \- Copy an Aria table to and from s3
-.SH DESCRIPTION
-Usage: aria_s3_copy \-\-aws\-access\-key=# \-\-aws\-secret\-access\-key=# \-\-aws\-region=# \-\-op=(from_s3 | to_s3 | delete_from_s3) [OPTIONS] tables[.MAI]
-.TP
-\fB\-?\fR, \fB\-h\fR, \fB\-\-help\fR
-Display help and exit.
-.TP
-\fB\-k\fR, \fB\-\-s3\-access\-key=name\fR
-AWS access key ID
-.TP
-\fB\-r\fR, \fB\-s3\-region=name\fR
-AWS region
-.TP
-\fB\-K\fR, \fB\-s3\-secret\-key=name\fR
-AWS secret access key ID
-.TP
-\fB\-b\fR, \fB\-s3\-bucket=name\fR
-AWS prefix for tables
-.TP
-\fB\-h\fR, \fB\-s3\-host\-name=name\fR
-Host name to S3 provider
-.TP
-\fB\-c\fR, \fB\-compress\fR
-Use compression
-.TP
-\fB\-o\fR, \fB\-op=name\fR
-Operation to execute. One of 'from_s3', 'to_s3' or 'delete_from_s3'
-.TP
-\fB\-d\fR, \fB\-database=name\fR
-Database for copied table (second prefix). If not given, the directory of the table file is used
-.TP
-\fB\-B\fR, \fB\-s3\-block\-size=#\fR
-Block size for data/index blocks in s3
-.TP
-\fB\-L\fR, \fB\-s3\-protocol\-version=name\fR
-Protocol used to communication with S3. One of "Auto", "Amazon" or "Original".
-.TP
-\fB\-f\fR, \fB\-force\fR
-Force copy even if target exists
-.TP
-\fB\-V\fR, \fB\-version\fR
-Print version and exit.
-.TP
-\fB\-\-s3\-debug\fR
-Output debug log from marias3 to stdout
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Be verbose.
-.PP
-For more information, please refer to the MariaDB Knowledge Base page https://mariadb.com/kb/en/aria_s3_copy/
diff --git a/man/mysqlaccess.1 b/man/mariadb-access.1
index 762c1959..762c1959 100644
--- a/man/mysqlaccess.1
+++ b/man/mariadb-access.1
diff --git a/man/mysqladmin.1 b/man/mariadb-admin.1
index 82c5dfc0..82c5dfc0 100644
--- a/man/mysqladmin.1
+++ b/man/mariadb-admin.1
diff --git a/man/mariabackup.1 b/man/mariadb-backup.1
index 705234fe..705234fe 100644
--- a/man/mariabackup.1
+++ b/man/mariadb-backup.1
diff --git a/man/mysqlbinlog.1 b/man/mariadb-binlog.1
index 70636d55..70636d55 100644
--- a/man/mysqlbinlog.1
+++ b/man/mariadb-binlog.1
diff --git a/man/mysqlcheck.1 b/man/mariadb-check.1
index 6191e933..6191e933 100644
--- a/man/mysqlcheck.1
+++ b/man/mariadb-check.1
diff --git a/man/mariadb-client-test-embedded.1 b/man/mariadb-client-test-embedded.1
new file mode 100644
index 00000000..327a06c5
--- /dev/null
+++ b/man/mariadb-client-test-embedded.1
@@ -0,0 +1 @@
+.so man1/mariadb-client-test.1
diff --git a/man/mysql_client_test.1 b/man/mariadb-client-test.1
index 2866dfa5..2866dfa5 100644
--- a/man/mysql_client_test.1
+++ b/man/mariadb-client-test.1
diff --git a/man/mysql_convert_table_format.1 b/man/mariadb-convert-table-format.1
index 89f6f37b..89f6f37b 100644
--- a/man/mysql_convert_table_format.1
+++ b/man/mariadb-convert-table-format.1
diff --git a/man/mysqldump.1 b/man/mariadb-dump.1
index 06ffd651..06ffd651 100644
--- a/man/mysqldump.1
+++ b/man/mariadb-dump.1
diff --git a/man/mysqldumpslow.1 b/man/mariadb-dumpslow.1
index 960c634d..960c634d 100644
--- a/man/mysqldumpslow.1
+++ b/man/mariadb-dumpslow.1
diff --git a/man/mariadb-embedded.1 b/man/mariadb-embedded.1
new file mode 100644
index 00000000..78fc18b3
--- /dev/null
+++ b/man/mariadb-embedded.1
@@ -0,0 +1 @@
+.so man1/mariadb.1
diff --git a/man/mysql_find_rows.1 b/man/mariadb-find-rows.1
index c80490c2..c80490c2 100644
--- a/man/mysql_find_rows.1
+++ b/man/mariadb-find-rows.1
diff --git a/man/mysql_fix_extensions.1 b/man/mariadb-fix-extensions.1
index 27029004..2313b9f6 100644
--- a/man/mysql_fix_extensions.1
+++ b/man/mariadb-fix-extensions.1
@@ -19,6 +19,8 @@ mariadb-fix-extensions \- normalize table file name extensions (mysql_fix_extens
 \fBmysql_fix_extensions \fR\fB\fIdata_dir\fR\fR
 .SH "DESCRIPTION"
 .PP
+This script is deprecated and will be removed in a later release.
+.PP
 \fBmysql_fix_extensions\fR
 converts the extensions for
 MyISAM
diff --git a/man/mysqlhotcopy.1 b/man/mariadb-hotcopy.1
index 01f26c15..01f26c15 100644
--- a/man/mysqlhotcopy.1
+++ b/man/mariadb-hotcopy.1
diff --git a/man/mysqlimport.1 b/man/mariadb-import.1
index 99578950..99578950 100644
--- a/man/mysqlimport.1
+++ b/man/mariadb-import.1
diff --git a/man/mysql_install_db.1 b/man/mariadb-install-db.1
index f945c259..f945c259 100644
--- a/man/mysql_install_db.1
+++ b/man/mariadb-install-db.1
diff --git a/man/mysql_plugin.1 b/man/mariadb-plugin.1
index 0512bb50..0512bb50 100644
--- a/man/mysql_plugin.1
+++ b/man/mariadb-plugin.1
diff --git a/man/mysql_secure_installation.1 b/man/mariadb-secure-installation.1
index 0d30ee24..0d30ee24 100644
--- a/man/mysql_secure_installation.1
+++ b/man/mariadb-secure-installation.1
diff --git a/man/mysql_setpermission.1 b/man/mariadb-setpermission.1
index 7725ad69..7725ad69 100644
--- a/man/mysql_setpermission.1
+++ b/man/mariadb-setpermission.1
diff --git a/man/mysqlshow.1 b/man/mariadb-show.1
index 85b20a97..85b20a97 100644
--- a/man/mysqlshow.1
+++ b/man/mariadb-show.1
diff --git a/man/mysqlslap.1 b/man/mariadb-slap.1
index dbb458ce..dbb458ce 100644
--- a/man/mysqlslap.1
+++ b/man/mariadb-slap.1
diff --git a/man/mariadb-test-embedded.1 b/man/mariadb-test-embedded.1
new file mode 100644
index 00000000..65bf1387
--- /dev/null
+++ b/man/mariadb-test-embedded.1
@@ -0,0 +1 @@
+.so man1/mariadb-test.1
diff --git a/man/mysqltest.1 b/man/mariadb-test.1
index b1326ba8..b1326ba8 100644
--- a/man/mysqltest.1
+++ b/man/mariadb-test.1
diff --git a/man/mysql_tzinfo_to_sql.1 b/man/mariadb-tzinfo-to-sql.1
index e287db0c..e287db0c 100644
--- a/man/mysql_tzinfo_to_sql.1
+++ b/man/mariadb-tzinfo-to-sql.1
diff --git a/man/mysql_upgrade.1 b/man/mariadb-upgrade.1
index 8532003a..8532003a 100644
--- a/man/mysql_upgrade.1
+++ b/man/mariadb-upgrade.1
diff --git a/man/mysql_waitpid.1 b/man/mariadb-waitpid.1
index 268518d5..268518d5 100644
--- a/man/mysql_waitpid.1
+++ b/man/mariadb-waitpid.1
diff --git a/man/mysql.1 b/man/mariadb.1
index 2e499a62..fec2b5c3 100644
--- a/man/mysql.1
+++ b/man/mariadb.1
@@ -1628,28 +1628,29 @@ SELECT
 statements when using
 \fB\-\-safe\-updates\fR\&. (Default value is 1,000\&.)
 .RE
-.\" MYSQL_HISTFILE environment variable
-.\" environment variable: MYSQL_HISTFILE
+.\" MARIADB_HISTFILE environment variable
+.\" environment variable: MARIADB_HISTFILE
 .\" HOME environment variable
 .\" environment variable: HOME
 .\" mysql history file
 .\" command-line history: mysql
-.\" .mysql_history file
+.\" .mariadb_history file
 .PP
 On Unix, the
 \fBmysql\fR
 client writes a record of executed statements to a history file\&. By default, this file is named
-\&.mysql_history
-and is created in your home directory\&. To specify a different file, set the value of the
-MYSQL_HISTFILE
-environment variable\&.
+\&.mariadb_history
+and is created in your home directory\&. For backwards compatibility \&.mysql_history will be used if present and
+\&.mariadb_history is missing\&. To specify a different file, set the value of the
+MARIADB_HISTFILE
+environment variable\&. The environment variable MYSQL_HISTFILE will be used if MARIADB_HISTFILE isn't present\&.
 .PP
 The
-\&.mysql_history
+\&.mariadb_history
 should be protected with a restrictive access mode because sensitive information might be written to it, such as the text of SQL statements that contain passwords\&.
 .PP
 If you do not want to maintain a history file, first remove
-\&.mysql_history
+\&.mariadb_history
 if it exists, and then use either of the following techniques:
 .sp
 .RS 4
@@ -1661,7 +1662,7 @@ if it exists, and then use either of the following techniques:
 .IP \(bu 2.3
 .\}
 Set the
-MYSQL_HISTFILE
+MARIADB_HISTFILE
 variable to
 /dev/null\&. To cause this setting to take effect each time you log in, put the setting in one of your shell's startup files\&.
 .RE
@@ -1675,7 +1676,7 @@ variable to
 .IP \(bu 2.3
 .\}
 Create
-\&.mysql_history
+\&.mariadb_history
 as a symbolic link to
 /dev/null:
 .sp
@@ -1683,7 +1684,7 @@ as a symbolic link to
 .RS 4
 .\}
 .nf
-shell> \fBln \-s /dev/null $HOME/\&.mysql_history\fR
+shell> \fBln \-s /dev/null $HOME/\&.mariadb_history\fR
 .fi
 .if n \{\
 .RE
diff --git a/man/mysql_config.1 b/man/mariadb_config.1
index 941e3728..941e3728 100644
--- a/man/mysql_config.1
+++ b/man/mariadb_config.1
diff --git a/man/mysqld_multi.1 b/man/mariadbd-multi.1
index aebae5dd..e51e3875 100644
--- a/man/mysqld_multi.1
+++ b/man/mariadbd-multi.1
@@ -579,8 +579,8 @@ script\&. Check especially the lines:
 MY_PWD=`pwd`
 # Check if we are starting this relative (for the binary release)
 if test \-d $MY_PWD/data/mysql \-a \e
-   \-f \&./share/mysql/english/errmsg\&.sys \-a \e
-   \-x \&./bin/mysqld
+   \-f \&./share/mariadb/english/errmsg\&.sys \-a \e
+   \-x \&./bin/mariadbd
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
 .fi
 .if n \{\
@@ -637,28 +637,28 @@ socket     = /tmp/mysql\&.sock2
 port       = 3307
 pid\-file   = /usr/local/mysql/var2/hostname\&.pid2
 datadir    = /usr/local/mysql/var2
-language   = /usr/local/share/mysql/english
+language   = /usr/local/share/mariadb/english
 user       = john
 [mysqld3]
 socket     = /tmp/mysql\&.sock3
 port       = 3308
 pid\-file   = /usr/local/mysql/var3/hostname\&.pid3
 datadir    = /usr/local/mysql/var3
-language   = /usr/local/share/mysql/swedish
+language   = /usr/local/share/mariadb/swedish
 user       = monty
 [mysqld4]
 socket     = /tmp/mysql\&.sock4
 port       = 3309
 pid\-file   = /usr/local/mysql/var4/hostname\&.pid4
 datadir    = /usr/local/mysql/var4
-language   = /usr/local/share/mysql/estonia
+language   = /usr/local/share/mariadb/estonia
 user       = tonu
 [mysqld6]
 socket     = /tmp/mysql\&.sock6
 port       = 3311
 pid\-file   = /usr/local/mysql/var6/hostname\&.pid6
 datadir    = /usr/local/mysql/var6
-language   = /usr/local/share/mysql/japanese
+language   = /usr/local/share/mariadb/japanese
 user       = jani
 .fi
 .if n \{\
diff --git a/man/mysqld_safe_helper.1 b/man/mariadbd-safe-helper.1
index 24bb980c..24bb980c 100644
--- a/man/mysqld_safe_helper.1
+++ b/man/mariadbd-safe-helper.1
diff --git a/man/mysqld_safe.1 b/man/mariadbd-safe.1
index ffd1d691..ffd1d691 100644
--- a/man/mysqld_safe.1
+++ b/man/mariadbd-safe.1
diff --git a/man/mysqld.8 b/man/mariadbd.8
index 16280234..16280234 100644
--- a/man/mysqld.8
+++ b/man/mariadbd.8
diff --git a/man/myrocks_hotbackup.1 b/man/myrocks_hotbackup.1
deleted file mode 100644
index 99dcbefa..00000000
--- a/man/myrocks_hotbackup.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH MYROCKS_HOTBACKUP "1" "15 May 2020" "MariaDB 10.11" "MariaDB Database System"
-.SH NAME
-myrocks_hotbackup \- streaming backup for MariaDB MyRocks
-.SH DESCRIPTION
-Usage:
-.PP
-Backup: set \fB\-o\fR pipefail; myrocks_hotbackup \fB\-\-user\fR=\fI\,root\/\fR \fB\-\-password\fR=\fI\,pw\/\fR \fB\-\-port\fR=\fI\,3306\/\fR \fB\-\-checkpoint_dir=\fR<directory where temporary backup hard links are created> | ssh \fB\-o\fR NoneEnabled=yes remote_server 'tar \fB\-xi\fR \fB\-C\fR <directory on remote server where backups will be sent>' . You need to execute backup command on a server where you take backups.
-.PP
-Backup using WDT: myrocks_hotbackup \fB\-\-user\fR=\fI\,root\/\fR \fB\-\-password\fR=\fI\,pw\/\fR \fB\-\-stream\fR=\fI\,wdt\/\fR \fB\-\-checkpoint_dir=\fR<directory where temporary backup hard links are created> \fB\-\-destination=\fR<remote host name> \fB\-\-backup_dir=\fR<remote directory name>. This has to be executed at the src host.
-.PP
-Move\-Back: myrocks_hotbackup \fB\-\-move_back\fR \fB\-\-datadir=\fR<dest mysql datadir> \fB\-\-rocksdb_datadir=\fR<dest rocksdb datadir> \fB\-\-rocksdb_waldir=\fR<dest rocksdb wal dir> \fB\-\-backup_dir=\fR<where backup files are stored> . You need to execute move\-back command on a server where backup files are sent.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-i\fR CHECKPOINT_INTERVAL, \fB\-\-interval\fR=\fI\,CHECKPOINT_INTERVAL\/\fR
-Number of seconds to renew checkpoint
-.TP
-\fB\-c\fR CHECKPOINT_DIRECTORY, \fB\-\-checkpoint_dir\fR=\fI\,CHECKPOINT_DIRECTORY\/\fR
-Local directory name where checkpoints will be
-created.
-.TP
-\fB\-d\fR DATADIR, \fB\-\-datadir\fR=\fI\,DATADIR\/\fR
-backup mode: src MySQL datadir. move_back mode: dest
-MySQL datadir
-.TP
-\fB\-s\fR OUTPUT_STREAM, \fB\-\-stream\fR=\fI\,OUTPUT_STREAM\/\fR
-Setting streaming backup options. Currently tar, WDT
-and xbstream are supported. Default is tar
-.TP
-\fB\-\-destination\fR=\fI\,DESTINATION\/\fR
-Remote server name. Only used for WDT mode so far.
-.TP
-\fB\-\-avg_mbytes_per_sec\fR=\fI\,AVG_MBYTES_PER_SEC\/\fR
-Average backup rate in MBytes/sec. WDT only.
-.TP
-\fB\-\-extra_wdt_sender_options\fR=\fI\,EXTRA_WDT_SENDER_OPTIONS\/\fR
-Extra options for WDT sender
-.TP
-\fB\-\-extra_wdt_receiver_options\fR=\fI\,EXTRA_WDT_RECEIVER_OPTIONS\/\fR
-Extra options for WDT receiver
-.TP
-\fB\-u\fR MYSQL_USER, \fB\-\-user\fR=\fI\,MYSQL_USER\/\fR
-MySQL user name
-.TP
-\fB\-p\fR MYSQL_PASSWORD, \fB\-\-password\fR=\fI\,MYSQL_PASSWORD\/\fR
-MySQL password name
-.TP
-\fB\-P\fR MYSQL_PORT, \fB\-\-port\fR=\fI\,MYSQL_PORT\/\fR
-MySQL port number
-.TP
-\fB\-S\fR MYSQL_SOCKET, \fB\-\-socket\fR=\fI\,MYSQL_SOCKET\/\fR
-MySQL socket path. Takes precedence over \fB\-\-port\fR.
-.TP
-\fB\-m\fR, \fB\-\-move_back\fR
-Moving MyRocks backup files to proper locations.
-.TP
-\fB\-r\fR ROCKSDB_DATADIR, \fB\-\-rocksdb_datadir\fR=\fI\,ROCKSDB_DATADIR\/\fR
-RocksDB target data directory where backup data files
-will be moved. Must be empty.
-.TP
-\fB\-w\fR ROCKSDB_WALDIR, \fB\-\-rocksdb_waldir\fR=\fI\,ROCKSDB_WALDIR\/\fR
-RocksDB target data directory where backup wal files
-will be moved. Must be empty.
-.TP
-\fB\-b\fR BACKUPDIR, \fB\-\-backup_dir\fR=\fI\,BACKUPDIR\/\fR
-backup mode for WDT: Remote directory to store backup.
-move_back mode: Locations where backup files are
-stored.
-.TP
-\fB\-f\fR, \fB\-\-skip_check_frm_timestamp\fR
-skipping to check if frm files are updated after
-starting backup.
-.TP
-\fB\-D\fR DEBUG_SIGNAL_FILE, \fB\-\-debug_signal_file\fR=\fI\,DEBUG_SIGNAL_FILE\/\fR
-debugging purpose: waiting until the specified file is
-created
-.SH "SEE ALSO"
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-.SH AUTHOR
-MariaDB Foundation (http://www.mariadb.org/).
diff --git a/man/mysql_client_test_embedded.1 b/man/mysql_client_test_embedded.1
deleted file mode 100644
index 41f52801..00000000
--- a/man/mysql_client_test_embedded.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/mysql_client_test.1
diff --git a/man/mysql_embedded.1 b/man/mysql_embedded.1
deleted file mode 100644
index 735c4e05..00000000
--- a/man/mysql_embedded.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/mysql.1
diff --git a/man/mysql_ldb.1 b/man/mysql_ldb.1
deleted file mode 100644
index 5d58bd0b..00000000
--- a/man/mysql_ldb.1
+++ /dev/null
@@ -1,16 +0,0 @@
-'\" t
-.\"
-.TH "\fBMARIADB-LDB\fR" "1" "15 May 2020" "MariaDB 10.11" "MariaDB Database System"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH NAME
-mariadb-ldb \- RocksDB tool  (mysql_ldb is now a symlink to mariadb-ldb)
-.SH DESCRIPTION
-Use \fBmysql_ldb \-\-help\fR for details on usage\.
-.PP
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
diff --git a/man/mysqltest_embedded.1 b/man/mysqltest_embedded.1
deleted file mode 100644
index a0048932..00000000
--- a/man/mysqltest_embedded.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/mysqltest.1