diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-07-12 16:36:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-07-13 08:55:26 +0200 |
| commit | 64583629aded09f74d6d14178475fe6b2c849c00 (patch) | |
| tree | d8e1f021e9d34d686f874e9dd3e868857490d953 | |
| parent | 12dc083a453dd12eb6563f622de2db05030f35de (diff) | |
| download | mariadb-git-64583629aded09f74d6d14178475fe6b2c849c00.tar.gz | |
MDEV-9588 Mariadb client-only build creates a useless mysqld_safe file
| -rw-r--r-- | scripts/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 759104c040a..d960f792a95 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -278,6 +278,15 @@ ELSE() wsrep_sst_xtrabackup-v2 ) 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_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY) @@ -285,18 +294,14 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config - mysql_fix_extensions mysql_setpermission mysql_secure_installation - mysql_zap mysqlaccess mysql_convert_table_format mysql_find_rows mytop mysqlhotcopy - mysqldumpslow - mysqld_multi - mysqld_safe + ${SERVER_SCRIPTS} ${WSREP_BINARIES} ${SYSTEMD_SCRIPTS} ) |