diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:59:57 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:59:57 +0200 |
| commit | b81b1943932a383a92bcd22d053e112198507ae2 (patch) | |
| tree | b02d52c43aed34e9320994555ca42fb952fdf10f /man | |
| parent | b18241e059c17d4ad533dac3729302aa0ef60345 (diff) | |
| parent | a27bfb2a872ea48a5083c2558bca58dc4358316f (diff) | |
| download | mariadb-git-b81b1943932a383a92bcd22d053e112198507ae2.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'man')
| -rw-r--r-- | man/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index e9df857d6bf..e6d7ab32e88 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -12,8 +12,9 @@ # You should have received a copy of the GNU General Public License # 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_rsync_wan.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 @@ -24,10 +25,11 @@ SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1 mysqld_multi.1 mysqld_safe.1 resolveip.1 mariadb-service-convert.1 mysqld_safe_helper.1 - wsrep_sst_mysqldump.1 - galera_recovery.1 galera_new_cluster.1 mysql_ldb.1 myrocks_hotbackup.1 - mbstream.1 mariabackup.1 ${MAN1_WSREP}) + 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 |