summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-01-31 13:16:11 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-01-31 13:16:11 +0200
commitc8bd8d5c64a2bbe603f28cfe10774556da5312a7 (patch)
treefe964e675b0b8a83c03537bb5395b5b9e635fe09
parent5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea (diff)
downloadmariadb-git-c8bd8d5c64a2bbe603f28cfe10774556da5312a7.tar.gz
MDEV-14330: After-merge fix
The merge commit 5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea accidentally omitted part of commit 07e34cddb66da2e9e4ab5bdd8d52d1a72c2d2e8e.
-rw-r--r--man/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index cdce3c9b983..f36da7c8915 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -23,9 +23,9 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
perror.1 replace.1 resolve_stack_dump.1
resolveip.1 mariadb-service-convert.1
- mysqld_safe_helper.1 tokuftdump.1 wsrep_sst_common.1
+ mysqld_safe_helper.1 wsrep_sst_common.1
wsrep_sst_mysqldump.1 wsrep_sst_rsync.1
- galera_recovery.1 galera_new_cluster.1 tokuft_logprint.1
+ galera_recovery.1 galera_new_cluster.1
mysql_ldb.1
wsrep_sst_mariabackup.1 mbstream.1 mariabackup.1
wsrep_sst_rsync_wan.1)