aboutsummaryrefslogtreecommitdiff
path: root/databases/mariadb104-client/files/patch-MDEV-11790
blob: 1794bcf44da78e73e7a9899837cc6ce3ee9a3ec8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
WITHOUT_SERVER installs server-only files

https://jira.mariadb.org/browse/MDEV-11790
--- extra/CMakeLists.txt.orig	2018-10-02 09:45:40 UTC
+++ extra/CMakeLists.txt
@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_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)
--- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
+++ 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)
@@ -298,14 +301,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}