Commit 64583629 authored by Sergei Golubchik's avatar Sergei Golubchik

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

parent 12dc083a
...@@ -278,6 +278,15 @@ ELSE() ...@@ -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() ...@@ -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}
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment