Attachment #164547 for bug #205433




 IF(UNIX)
  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
    "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
@@ -150,6 +153,7 @@ IF(UNIX)
   COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
 )
 ENDIF()
+ENDIF()
 
 IF(NOT WITHOUT_SERVER)
+IF(FALSE)
   INSTALL(FILES
@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
     ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
@@ -282,6 +286,7 @@ SET(HOSTNAME "hostname")
 SET(MYSQLD_USER "mysql")
 
 ENDIF(UNIX)
+ENDIF()
 
 SET(bindir ${prefix}/${INSTALL_BINDIR})
 SET(sbindir ${prefix}/${INSTALL_SBINDIR})
@@ -347,6 +352,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
           SET(${var} "${${var}}-l${lib} " ) 

         ELSE()
           SET(${var} "${${var}}-l${lib} " ) 
         ENDIF()
@@ -430,19 +436,7 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(mysql_config_COMPONENT COMPONENT Development)
 
-  IF(WITH_SYSTEMD)
-    SET(BIN_SCRIPTS
-      mysql_config
-      mysqldumpslow
-      )
-  ELSE()
-    SET(BIN_SCRIPTS
-      mysql_config
-      mysqldumpslow
-      mysqld_multi
-      mysqld_safe
-      )
-  ENDIF()
+  SET(BIN_SCRIPTS mysql_config)
 
   SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
   STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
       ${CMAKE_CURRENT_BINARY_DIR}/mysql.conf ESCAPE_QUOTES @ONLY)
 
+IF(FALSE)
     INSTALL_SCRIPT(
       ${CMAKE_CURRENT_BINARY_DIR}/mysqld_pre_systemd
       DESTINATION ${INSTALL_BINDIR}
       COMPONENT Server
     )
+ENDIF()
 
     IF(INSTALL_LAYOUT MATCHES "STANDALONE")
       SET(SYSTEMD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
@@ -532,6 +537,7 @@ ELSE()
     )
   ENDIF()
 ENDIF()
+ENDIF()
 
 # Install libgcc as  mylibgcc.a
 IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")

Lines 1-4 Link Here

(-)files/patch-storage_myisam_mi__dynrec.c (-1 / +1 lines)
1	--- storage/myisam/mi_dynrec.c.orig 2015-12-14 07:39:39 UTC	1	--- storage/myisam/mi_dynrec.c.orig 2015-11-29 19:16:24 UTC
2	+++ storage/myisam/mi_dynrec.c	2	+++ storage/myisam/mi_dynrec.c
3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my	3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
4	DBUG_RETURN(1);	4	DBUG_RETURN(1);

Lines 1-4 Link Here

(-)pkg-plist (+2 lines)
1	bin/mysql	1	bin/mysql
		2	bin/mysql_config
2	bin/mysql_config_editor	3	bin/mysql_config_editor
3	bin/mysql_ssl_rsa_setup	4	bin/mysql_ssl_rsa_setup
4	bin/mysqladmin	5	bin/mysqladmin
Lines 115-120 Link Here
115	lib/mysql/libmysqlclient.so	116	lib/mysql/libmysqlclient.so
116	lib/mysql/libmysqlclient.so.20	117	lib/mysql/libmysqlclient.so.20
117	lib/mysql/libmysqlservices.a	118	lib/mysql/libmysqlservices.a
		119	libdata/pkgconfig/mysqlclient.pc
118	man/man1/comp_err.1.gz	120	man/man1/comp_err.1.gz
119	man/man1/mysql.1.gz	121	man/man1/mysql.1.gz
120	man/man1/mysql_config.1.gz	122	man/man1/mysql_config.1.gz

Return to bug 205433

Lines 24-46 Link Here

(-)files/patch-scripts_CMakeLists.txt (-45 / +21 lines)
24	IF(UNIX)	24	IF(UNIX)
25	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution	25	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
26	"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )	26	"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
27	@@ -152,6 +155,7 @@ IF(UNIX)	27	@@ -150,6 +153,7 @@ IF(UNIX)
		28	COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
		29	)
28	ENDIF()	30	ENDIF()
		31	+ENDIF()
29		32
30	IF(NOT WITHOUT_SERVER)	33	IF(NOT WITHOUT_SERVER)
31	+IF(FALSE)
32	INSTALL(FILES	34	INSTALL(FILES
33	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql	35	@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
34	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
35	@@ -282,6 +286,7 @@ SET(HOSTNAME "hostname")
36	SET(MYSQLD_USER "mysql")
37
38	ENDIF(UNIX)
39	+ENDIF()
40
41	SET(bindir ${prefix}/${INSTALL_BINDIR})
42	SET(sbindir ${prefix}/${INSTALL_SBINDIR})
43	@@ -347,6 +352,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
44	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	36	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
45	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	37	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
46	SET(${var} "${${var}}-l${lib} " )	38	SET(${var} "${${var}}-l${lib} " )
Lines 49-88 Link Here
49	ELSE()	41	ELSE()
50	SET(${var} "${${var}}-l${lib} " )	42	SET(${var} "${${var}}-l${lib} " )
51	ENDIF()	43	ENDIF()
52	@@ -433,14 +440,10 @@ ELSE()	44	@@ -430,19 +436,7 @@ ELSE()
53	IF(WITH_SYSTEMD)	45	# On Unix, most of the files end up in the bin directory
54	SET(BIN_SCRIPTS	46	SET(mysql_config_COMPONENT COMPONENT Development)
55	mysql_config	47
		48	- IF(WITH_SYSTEMD)
		49	- SET(BIN_SCRIPTS
		50	- mysql_config
56	- mysqldumpslow	51	- mysqldumpslow
57	)	52	- )
58	ELSE()	53	- ELSE()
59	SET(BIN_SCRIPTS	54	- SET(BIN_SCRIPTS
60	mysql_config	55	- mysql_config
61	- mysqldumpslow	56	- mysqldumpslow
62	- mysqld_multi	57	- mysqld_multi
63	- mysqld_safe	58	- mysqld_safe
64	)	59	- )
65	ENDIF()	60	- ENDIF()
		61	+ SET(BIN_SCRIPTS mysql_config)
66		62
67	@@ -510,11 +513,13 @@ ELSE()	63	SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
68	CONFIGURE_FILE(systemd/mysqld.tmpfiles.d.in	64	STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
69	${CMAKE_CURRENT_BINARY_DIR}/mysql.conf ESCAPE_QUOTES @ONLY)
70
71	+IF(FALSE)
72	INSTALL_SCRIPT(
73	${CMAKE_CURRENT_BINARY_DIR}/mysqld_pre_systemd
74	DESTINATION ${INSTALL_BINDIR}
75	COMPONENT Server
76	)
77	+ENDIF()
78
79	IF(INSTALL_LAYOUT MATCHES "STANDALONE")
80	SET(SYSTEMD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
81	@@ -532,6 +537,7 @@ ELSE()
82	)
83	ENDIF()
84	ENDIF()
85	+ENDIF()
86
87	# Install libgcc as mylibgcc.a
88	IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")