Attachment #340398 for bug #436978

View | Details | Raw Unified | Return to bug 436978
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-4 / +4 lines)
0	-- mysql-5.6-5.6.9-rc+dfsg.orig/cmake/readline.cmake	0	++ mysql-5.6-5.6.9-rc+dfsg/cmake/readline.cmake
Lines 192-200 MACRO (MYSQL_CHECK_READLINE) Link Here
192	IF(WITH_LIBEDIT)	192	IF(WITH_LIBEDIT)
193	MYSQL_USE_BUNDLED_LIBEDIT()	193	MYSQL_USE_BUNDLED_LIBEDIT()
194	ELSE()	194	ELSE()
195	FIND_SYSTEM_LIBEDIT(edit)	195	FIND_SYSTEM_LIBEDIT(readline)
196	IF(NOT_LIBEDIT_FOUND)	196	IF(NOT_LIBREADLINE_FOUND)
197	MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT")	197	MESSAGE(FATAL_ERROR "Cannot find system libreadline libraries.Use WITH_LIBREADLINE")
198	ENDIF()	198	ENDIF()
199	ENDIF()	199	ENDIF()
200	ENDIF(NOT WIN32)	200	ENDIF(NOT WIN32)

Lines 63-69 Link Here

(-)a/storage/perfschema/unittest/CMakeLists.txt (-1 / +1 lines)
63	TARGET_LINK_LIBRARIES(pfs_connect_attr-t sql binlog rpl master slave sql)	63	TARGET_LINK_LIBRARIES(pfs_connect_attr-t sql binlog rpl master slave sql)
64	TARGET_LINK_LIBRARIES(pfs_connect_attr-t mysys mysys_ssl)	64	TARGET_LINK_LIBRARIES(pfs_connect_attr-t mysys mysys_ssl)
65	TARGET_LINK_LIBRARIES(pfs_connect_attr-t vio ${SSL_LIBRARIES})	65	TARGET_LINK_LIBRARIES(pfs_connect_attr-t vio ${SSL_LIBRARIES})
66	TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys zlib)	66	TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys ${ZLIB_LIBRARY})
67	ADD_TEST(pfs_connect_attr pfs_connect_attr-t)	67	ADD_TEST(pfs_connect_attr pfs_connect_attr-t)
68		68
69	# On windows, pfs_connect_attr-t may depend on openssl dlls.	69	# On windows, pfs_connect_attr-t may depend on openssl dlls.

Return to bug 436978