Attachment #166801 for bug #206998

View | Details | Raw Unified | Return to bug 206998 | Differences between

and this patch




--- CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ CMakeLists.txt
@@ -579,8 +579,8 @@ ENDIF()
 
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(client)

 
 IF(UNIX)
   ADD_SUBDIRECTORY(man)
@@ -653,14 +653,13 @@ ELSE()
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -683,6 +682,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()




--- client/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ client/CMakeLists.txt
@@ -47,6 +47,7 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
 ENDIF(UNIX)
 

 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
     upgrade/program.cc
@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
 TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
 ENDIF()

 
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
 

 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
 

 
 IF(UNIX AND NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_install_db
@@ -122,7 +130,6 @@ IF(WIN32)
 ENDIF(WIN32)
 
 SET_TARGET_PROPERTIES (

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-cmake_build__configurations_compiler__options.cmake (-1 / +1 lines)
1	--- cmake/build_configurations/compiler_options.cmake.orig 2015-11-29 19:16:24 UTC	1	--- cmake/build_configurations/compiler_options.cmake.orig 2016-02-01 23:31:58 UTC
2	+++ cmake/build_configurations/compiler_options.cmake	2	+++ cmake/build_configurations/compiler_options.cmake
3	@@ -28,7 +28,7 @@ IF(UNIX)	3	@@ -28,7 +28,7 @@ IF(UNIX)
4		4

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-cmake_os_DragonFly.cmake (-1 / +1 lines)
1	--- cmake/os/DragonFly.cmake.orig 2015-12-17 10:53:10 UTC	1	--- cmake/os/DragonFly.cmake.orig 2016-02-09 14:40:22 UTC
2	+++ cmake/os/DragonFly.cmake	2	+++ cmake/os/DragonFly.cmake
3	@@ -0,0 +1,24 @@	3	@@ -0,0 +1,24 @@
4	+INCLUDE(CheckCSourceRuns)	4	+INCLUDE(CheckCSourceRuns)

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-cmd-line-utils_libedit_chartype.h (-1 / +1 lines)
1	--- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/chartype.h.orig 2016-02-01 23:31:58 UTC
2	+++ cmd-line-utils/libedit/chartype.h	2	+++ cmd-line-utils/libedit/chartype.h
3	@@ -49,7 +49,7 @@	3	@@ -49,7 +49,7 @@
4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */	4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-cmd-line-utils_libedit_vi.c (-1 / +1 lines)
1	--- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/vi.c.orig 2016-02-01 23:31:58 UTC
2	+++ cmd-line-utils/libedit/vi.c	2	+++ cmd-line-utils/libedit/vi.c
3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att	3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
4	* NB: posix implies that we should enter insert mode, however	4	* NB: posix implies that we should enter insert mode, however

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-extra_CMakeLists.txt (-1 / +1 lines)
1	--- extra/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- extra/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ extra/CMakeLists.txt	2	+++ extra/CMakeLists.txt
3	@@ -45,6 +45,7 @@ ENDIF()	3	@@ -45,6 +45,7 @@ ENDIF()
4		4

Lines 1-6 Link Here

(-)mysql57-client.work/files/patch-include_CMakeLists.txt (-3 / +2 lines)
1	--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- include/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -37,6 +37,7 @@ SET(HEADERS_ABI	3	@@ -38,6 +38,7 @@ SET(HEADERS_ABI
4		4
5	SET(HEADERS	5	SET(HEADERS
6	${HEADERS_ABI}	6	${HEADERS_ABI}
Lines 8-11 Link Here
8	my_dbug.h	8	my_dbug.h
9	m_string.h	9	m_string.h
10	my_sys.h	10	my_sys.h
11

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-include_my__compare.h (-1 / +1 lines)
1	--- include/my_compare.h.orig 2015-11-29 19:16:24 UTC	1	--- include/my_compare.h.orig 2016-02-01 23:31:58 UTC
2	+++ include/my_compare.h	2	+++ include/my_compare.h
3	@@ -40,7 +40,7 @@ extern "C" {	3	@@ -40,7 +40,7 @@ extern "C" {
4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-include_myisam.h (-1 / +1 lines)
1	--- include/myisam.h.orig 2015-11-29 19:16:24 UTC	1	--- include/myisam.h.orig 2016-02-01 23:31:58 UTC
2	+++ include/myisam.h	2	+++ include/myisam.h
3	@@ -45,7 +45,7 @@ extern "C" {	3	@@ -45,7 +45,7 @@ extern "C" {
4	The following defines can be increased if necessary.	4	The following defines can be increased if necessary.

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-libmysql_CMakeLists.txt (-1 / +1 lines)
1	--- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- libmysql/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)	3	@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
4	COMPONENT SharedLibraries)	4	COMPONENT SharedLibraries)

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-man_CMakeLists.txt (-1 / +1 lines)
1	--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- man/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -14,11 +14,7 @@	3	@@ -14,11 +14,7 @@
4	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA	4	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-mysys__ssl_my__default.cc (-1 / +1 lines)
1	--- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC	1	--- mysys_ssl/my_default.cc.orig 2016-02-01 23:31:58 UTC
2	+++ mysys_ssl/my_default.cc	2	+++ mysys_ssl/my_default.cc
3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;	3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
4		4

Lines 1-4 Link Here

(-)mysql57-client.work/files/patch-scripts_CMakeLists.txt (-1 / +1 lines)
1	--- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- scripts/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -43,6 +43,7 @@ ELSE()	3	@@ -43,6 +43,7 @@ ELSE()
4	MESSAGE(FATAL_ERROR "Cannot concatenate files")	4	MESSAGE(FATAL_ERROR "Cannot concatenate files")

Lines 1-4 Link Here

(-)mysql57-client.work/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 2016-02-01 23:31:58 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

(-)mysql57-client.work/files/patch-support-files_CMakeLists.txt (-1 / +1 lines)
1	--- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- support-files/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ support-files/CMakeLists.txt	2	+++ support-files/CMakeLists.txt
3	@@ -44,14 +44,17 @@ ELSE()	3	@@ -44,14 +44,17 @@ ELSE()
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})

Return to bug 206998

Lines 1-6 Link Here

(-)mysql57-client.work/files/patch-CMakeLists.txt (-4 / +4 lines)
1	--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -569,8 +569,8 @@ ENDIF()	3	@@ -579,8 +579,8 @@ ENDIF()
4		4
5	ADD_SUBDIRECTORY(extra)	5	ADD_SUBDIRECTORY(extra)
6	ADD_SUBDIRECTORY(client)	6	ADD_SUBDIRECTORY(client)
Lines 10-16 Link Here
10		10
11	IF(UNIX)	11	IF(UNIX)
12	ADD_SUBDIRECTORY(man)	12	ADD_SUBDIRECTORY(man)
13	@@ -639,14 +639,13 @@ ELSE()	13	@@ -653,14 +653,13 @@ ELSE()
14	SET(CPACK_GENERATOR "TGZ")	14	SET(CPACK_GENERATOR "TGZ")
15	ENDIF()	15	ENDIF()
16	ADD_SUBDIRECTORY(packaging/WiX)	16	ADD_SUBDIRECTORY(packaging/WiX)
Lines 26-32 Link Here
26	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	26	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
27	INSTALL(FILES COPYING LICENSE.mysql	27	INSTALL(FILES COPYING LICENSE.mysql
28	DESTINATION ${INSTALL_DOCREADMEDIR}	28	DESTINATION ${INSTALL_DOCREADMEDIR}
29	@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	29	@@ -683,6 +682,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
30	PATTERN "sp-imp-spec.txt" EXCLUDE	30	PATTERN "sp-imp-spec.txt" EXCLUDE
31	)	31	)
32	ENDIF()	32	ENDIF()

Lines 1-6 Link Here

(-)mysql57-client.work/files/patch-client_CMakeLists.txt (-6 / +6 lines)
1	--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- client/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -121,6 +121,7 @@ IF(UNIX)	3	@@ -47,6 +47,7 @@ IF(UNIX)
4	TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})	4	TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
5	ENDIF(UNIX)	5	ENDIF(UNIX)
6		6
Lines 8-14 Link Here
8	IF(NOT WITHOUT_SERVER)	8	IF(NOT WITHOUT_SERVER)
9	MYSQL_ADD_EXECUTABLE(mysql_upgrade	9	MYSQL_ADD_EXECUTABLE(mysql_upgrade
10	upgrade/program.cc	10	upgrade/program.cc
11	@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(	11	@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
12	TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)	12	TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
13	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)	13	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
14	ENDIF()	14	ENDIF()
Lines 22-28 Link Here
22		22
23	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	23	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
24	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	24	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
25	@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc	25	@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
26	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	26	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
27	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)	27	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
28		28
Lines 33-39 Link Here
33		33
34	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	34	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
35	ADD_COMPILE_FLAGS(	35	ADD_COMPILE_FLAGS(
36	@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli	36	@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
37	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	37	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
38	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	38	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
39		39
Lines 44-50 Link Here
44		44
45	IF(UNIX AND NOT WITHOUT_SERVER)	45	IF(UNIX AND NOT WITHOUT_SERVER)
46	MYSQL_ADD_EXECUTABLE(mysql_install_db	46	MYSQL_ADD_EXECUTABLE(mysql_install_db
47	@@ -196,7 +204,6 @@ IF(WIN32)	47	@@ -122,7 +130,6 @@ IF(WIN32)
48	ENDIF(WIN32)	48	ENDIF(WIN32)
49		49
50	SET_TARGET_PROPERTIES (	50	SET_TARGET_PROPERTIES (

Lines 53-58 Link Here

(-)mysql57-client.work/pkg-plist (+4 lines)
53	include/mysql/mysql/plugin_ftparser.h	53	include/mysql/mysql/plugin_ftparser.h
54	include/mysql/mysql/plugin_ftparser.h.pp	54	include/mysql/mysql/plugin_ftparser.h.pp
55	include/mysql/mysql/plugin_group_replication.h	55	include/mysql/mysql/plugin_group_replication.h
		56	include/mysql/mysql/plugin_keyring.h
		57	include/mysql/mysql/plugin_keyring.h.pp
56	include/mysql/mysql/plugin_trace.h	58	include/mysql/mysql/plugin_trace.h
57	include/mysql/mysql/plugin_validate_password.h	59	include/mysql/mysql/plugin_validate_password.h
58	include/mysql/mysql/psi/mysql_file.h	60	include/mysql/mysql/psi/mysql_file.h
Lines 75-80 Link Here
75	include/mysql/mysql/service_my_plugin_log.h	77	include/mysql/mysql/service_my_plugin_log.h
76	include/mysql/mysql/service_my_snprintf.h	78	include/mysql/mysql/service_my_snprintf.h
77	include/mysql/mysql/service_mysql_alloc.h	79	include/mysql/mysql/service_mysql_alloc.h
		80	include/mysql/mysql/service_mysql_keyring.h
78	include/mysql/mysql/service_mysql_password_policy.h	81	include/mysql/mysql/service_mysql_password_policy.h
79	include/mysql/mysql/service_mysql_string.h	82	include/mysql/mysql/service_mysql_string.h
80	include/mysql/mysql/service_parser.h	83	include/mysql/mysql/service_parser.h
Lines 103-108 Link Here
103	include/mysql/plugin_audit.h	106	include/mysql/plugin_audit.h
104	include/mysql/plugin_ftparser.h	107	include/mysql/plugin_ftparser.h
105	include/mysql/plugin_group_replication.h	108	include/mysql/plugin_group_replication.h
		109	include/mysql/plugin_keyring.h
106	include/mysql/plugin_validate_password.h	110	include/mysql/plugin_validate_password.h
107	include/mysql/sql_common.h	111	include/mysql/sql_common.h
108	include/mysql/sql_state.h	112	include/mysql/sql_state.h