diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-11-29 05:21:03 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-28 18:21:03 +0000 |
| commit | 7b44d0ba573c3a07d5fe8b43251c705ec1d63597 (patch) | |
| tree | af2014421266e78acd2757e1428313ad3d008303 /man | |
| parent | bd694bb7b28f64eb36704dd795ae351117ebeea4 (diff) | |
| download | mariadb-git-7b44d0ba573c3a07d5fe8b43251c705ec1d63597.tar.gz | |
MDEV-23230 wsrep files installed when built without WSREP (#2334)
Prevent wsrep files from being installed if WITH_WSREP=OFF.
Reviewed by Daniel Black
Additionally excluded #include wsrep files and galera* files
along with galera/wsrep tests.
mysql-test/include/have_wsrep.inc remainds as its used by
a few isolated tests.
Co-authored-by: Chris Ross <cross2@cisco.com>
Diffstat (limited to 'man')
| -rw-r--r-- | man/CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index f5ae0a0fb38..975bfd5e887 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -13,6 +13,8 @@ # 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 @@ -24,12 +26,12 @@ SET(MAN1_SERVER innochecksum.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 wsrep_sst_common.1 - wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 - galera_recovery.1 galera_new_cluster.1 + mysqld_safe_helper.1 mysql_ldb.1 myrocks_hotbackup.1 - wsrep_sst_mariabackup.1 mbstream.1 mariabackup.1 - wsrep_sst_rsync_wan.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 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 |