From 35aa451747375eae83e603f05936009bf75fad62 Mon Sep 17 00:00:00 2001
From: Bernard Spil <Sp1l@users.noreply.github.com>
Date: Sat, 27 Oct 2018 14:34:15 +0200
Subject: MDEV-11790: WITHOUT_SERVER installs server-only files-extensions

- Make `replace` utility a `Client` component

based on the man-page
```
The replace program is used by msql2mysql. See msql2mysql(1).
```
msql2mysql is labeled as Client component, so should the dependency

- Assign scripts to `Client` component and order list in `BIN_SCRIPTS`
Based on PR 900
---
 extra/CMakeLists.txt   |  2 +-
 scripts/CMakeLists.txt | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index d9c424f2803..c04cdc5237a 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -102,7 +102,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_XTRADB_STORAGE_ENGINE)
   ADD_DEPENDENCIES(innochecksum GenError)
 ENDIF()
 
-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
 TARGET_LINK_LIBRARIES(replace mysys)
 
 IF(UNIX)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index e2fd853ce13..09301d1e403 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -241,7 +241,10 @@ ENDIF()
 SET(mysql_config_COMPONENT COMPONENT Development)
 SET(msql2mysql_COMPONENT COMPONENT Client)
 SET(mysqlaccess_COMPONENT COMPONENT Client)
+SET(mysqlhotcopy_COMPONENT COMPONENT Client)
+SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
 SET(mysql_find_rows_COMPONENT COMPONENT Client)
+SET(mysql_setpermission_COMPONENT COMPONENT Client)
 SET(mytop_COMPONENT Mytop)
 
 IF(WIN32)
@@ -328,14 +331,14 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(BIN_SCRIPTS
     msql2mysql
-    mysql_config
-    mysql_setpermission
-    mysql_secure_installation
     mysqlaccess
+    mysqlhotcopy
+    mysql_config
     mysql_convert_table_format
     mysql_find_rows
+    mysql_secure_installation
+    mysql_setpermission
     mytop
-    mysqlhotcopy
     ${SERVER_SCRIPTS}
     ${WSREP_SCRIPTS}
     ${SYSTEMD_SCRIPTS}
-- 
cgit v1.2.1