database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-9588 Mariadb client-only build creates a useless mysqld_safe file

Browse Source
This commit is contained in:
Sergei Golubchik
2016-07-12 16:36:43 +02:00
parent 12dc083a45
commit 64583629ad
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/CMakeLists.txt
View File

@@ -278,6 +278,15 @@ ELSE()
wsrep_sst_xtrabackup-v2 wsrep_sst_xtrabackup-v2
) )
ENDIF() ENDIF()
IF (NOT WITHOUT_SERVER)
SET(SERVER_SCRIPTS
mysql_fix_extensions
mysql_zap
mysqld_multi
mysqld_safe
mysqldumpslow
)
ENDIF()
# Configure this one, for testing, but do not install it. # Configure this one, for testing, but do not install it.
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
@@ -285,18 +294,14 @@ ELSE()
SET(BIN_SCRIPTS SET(BIN_SCRIPTS
msql2mysql msql2mysql
mysql_config mysql_config
mysql_fix_extensions
mysql_setpermission mysql_setpermission
mysql_secure_installation mysql_secure_installation
mysql_zap
mysqlaccess mysqlaccess
mysql_convert_table_format mysql_convert_table_format
mysql_find_rows mysql_find_rows
mytop mytop
mysqlhotcopy mysqlhotcopy
mysqldumpslow ${SERVER_SCRIPTS}
mysqld_multi
mysqld_safe
${WSREP_BINARIES} ${WSREP_BINARIES}
${SYSTEMD_SCRIPTS} ${SYSTEMD_SCRIPTS}
) )