summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2020-08-07 15:26:54 +0200
committerDaniel Black <daniel@mariadb.org>2020-08-19 09:29:11 +1000
commitd739e6192d1c53e516dda1507e094620b337c5c1 (patch)
treebda598dac827a71d56158b71fe7cd234feb83f40
parent26ba3f4dc49fc243507ce36e2aca8971388fc588 (diff)
downloadmariadb-git-d739e6192d1c53e516dda1507e094620b337c5c1.tar.gz
MDEV-23429: Remove WSREP when using WITHOUT_SERVER
- Man pages related to `wsrep` are still there since they belong to `MAN1_SERVER` component and can be excluded while configuring with cmake. ``` -- Installing: /tmp/102_noserver/include/mysql/server/mysql/service_wsrep.h -- Installing: /tmp/102_noserver/include/mysql/server/private/./wsrep.h -- Installing: /tmp/102_noserver/man/man1/wsrep_sst_common.1 -- Installing: /tmp/102_noserver/man/man1/wsrep_sst_mysqldump.1 -- Installing: /tmp/102_noserver/man/man1/wsrep_sst_rsync.1 -- Installing: /tmp/102_noserver/man/man1/wsrep_sst_xtrabackup-v2.1 -- Installing: /tmp/102_noserver/man/man1/wsrep_sst_xtrabackup.1 -- Installing: /tmp/102_noserver/man/man1/wsrep_sst_mariabackup.1 -- Installing: /tmp/102_noserver/man/man1/wsrep_sst_rsync_wan.1 ``` - Additionally move replace/mysqlhot/mysql_setpermission/mysql_convert_table_format man pages to `ManPagesClient` component.
-rw-r--r--cmake/wsrep.cmake2
-rw-r--r--man/CMakeLists.txt13
-rw-r--r--support-files/CMakeLists.txt4
3 files changed, 10 insertions, 9 deletions
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index a1e8fc39fca..f2d6e67e023 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -17,7 +17,7 @@
#
# Galera library does not compile with windows
#
-IF(UNIX)
+IF(UNIX AND NOT WITHOUT_SERVER)
SET(with_wsrep_default ON)
ELSE()
SET(with_wsrep_default OFF)
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 5acec2ede67..9916069da96 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -16,12 +16,12 @@
SET(MAN1_SERVER innochecksum.1 my_print_defaults.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
- mysql_convert_table_format.1 mysql_fix_extensions.1
+ mysql_fix_extensions.1
mysql_install_db.1
- mysql_secure_installation.1 mysql_setpermission.1
- mysql_tzinfo_to_sql.1 mysql_upgrade.1
- mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
- perror.1 replace.1 resolve_stack_dump.1
+ mysql_secure_installation.1
+ mysql_tzinfo_to_sql.1 mysql_upgrade.1
+ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1
+ perror.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
@@ -34,7 +34,8 @@ 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
mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
- mysql_plugin.1 mysql_embedded.1)
+ mysql_plugin.1 mysql_embedded.1 replace.1 mysqlhotcopy.1
+ mysql_setpermission.1 mysql_convert_table_format.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
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index 038e7163901..fd018f6f1d6 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -50,14 +50,14 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
ENDFOREACH()
ENDIF()
-IF(WITH_WSREP)
+IF(WITH_WSREP AND NOT WITHOUT_SERVER)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh
${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension}
DESTINATION ${inst_location} COMPONENT IniFiles)
ENDIF()
-IF(UNIX)
+IF(UNIX AND NOT WITHOUT_SERVER)
SET(prefix ${CMAKE_INSTALL_PREFIX})
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh