diff -Naur mysql57-client.orig/files/patch-CMakeLists.txt mysql57-client.work/files/patch-CMakeLists.txt --- mysql57-client.orig/files/patch-CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-client.work/files/patch-CMakeLists.txt 2016-02-09 15:41:26.126892000 +0100 @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ CMakeLists.txt -@@ -569,8 +569,8 @@ ENDIF() +@@ -579,8 +579,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,7 +10,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -639,14 +639,13 @@ ELSE() +@@ -653,14 +653,13 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -26,7 +26,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -683,6 +682,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() diff -Naur mysql57-client.orig/files/patch-client_CMakeLists.txt mysql57-client.work/files/patch-client_CMakeLists.txt --- mysql57-client.orig/files/patch-client_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-client.work/files/patch-client_CMakeLists.txt 2016-02-09 15:41:26.129082000 +0100 @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- client/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ client/CMakeLists.txt -@@ -121,6 +121,7 @@ IF(UNIX) +@@ -47,6 +47,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) @@ -8,7 +8,7 @@ IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc -@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS( +@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS( TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) ENDIF() @@ -22,7 +22,7 @@ ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) -@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc +@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) @@ -33,7 +33,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) ADD_COMPILE_FLAGS( -@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli +@@ -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) @@ -44,7 +44,7 @@ IF(UNIX AND NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_install_db -@@ -196,7 +204,6 @@ IF(WIN32) +@@ -122,7 +130,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( diff -Naur mysql57-client.orig/files/patch-cmake_build__configurations_compiler__options.cmake mysql57-client.work/files/patch-cmake_build__configurations_compiler__options.cmake --- mysql57-client.orig/files/patch-cmake_build__configurations_compiler__options.cmake 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-cmake_build__configurations_compiler__options.cmake 2016-02-09 15:41:26.131273000 +0100 @@ -1,4 +1,4 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2015-11-29 19:16:24 UTC +--- cmake/build_configurations/compiler_options.cmake.orig 2016-02-01 23:31:58 UTC +++ cmake/build_configurations/compiler_options.cmake @@ -28,7 +28,7 @@ IF(UNIX) diff -Naur mysql57-client.orig/files/patch-cmake_os_DragonFly.cmake mysql57-client.work/files/patch-cmake_os_DragonFly.cmake --- mysql57-client.orig/files/patch-cmake_os_DragonFly.cmake 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-cmake_os_DragonFly.cmake 2016-02-09 15:41:26.133448000 +0100 @@ -1,4 +1,4 @@ ---- cmake/os/DragonFly.cmake.orig 2015-12-17 10:53:10 UTC +--- cmake/os/DragonFly.cmake.orig 2016-02-09 14:40:22 UTC +++ cmake/os/DragonFly.cmake @@ -0,0 +1,24 @@ +INCLUDE(CheckCSourceRuns) diff -Naur mysql57-client.orig/files/patch-cmd-line-utils_libedit_chartype.h mysql57-client.work/files/patch-cmd-line-utils_libedit_chartype.h --- mysql57-client.orig/files/patch-cmd-line-utils_libedit_chartype.h 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-cmd-line-utils_libedit_chartype.h 2016-02-09 15:41:26.135642000 +0100 @@ -1,4 +1,4 @@ ---- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC +--- cmd-line-utils/libedit/chartype.h.orig 2016-02-01 23:31:58 UTC +++ cmd-line-utils/libedit/chartype.h @@ -49,7 +49,7 @@ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ diff -Naur mysql57-client.orig/files/patch-cmd-line-utils_libedit_vi.c mysql57-client.work/files/patch-cmd-line-utils_libedit_vi.c --- mysql57-client.orig/files/patch-cmd-line-utils_libedit_vi.c 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-cmd-line-utils_libedit_vi.c 2016-02-09 15:41:26.137797000 +0100 @@ -1,4 +1,4 @@ ---- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC +--- cmd-line-utils/libedit/vi.c.orig 2016-02-01 23:31:58 UTC +++ cmd-line-utils/libedit/vi.c @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att * NB: posix implies that we should enter insert mode, however diff -Naur mysql57-client.orig/files/patch-extra_CMakeLists.txt mysql57-client.work/files/patch-extra_CMakeLists.txt --- mysql57-client.orig/files/patch-extra_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-client.work/files/patch-extra_CMakeLists.txt 2016-02-09 15:41:26.139948000 +0100 @@ -1,4 +1,4 @@ ---- extra/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- extra/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ extra/CMakeLists.txt @@ -45,6 +45,7 @@ ENDIF() diff -Naur mysql57-client.orig/files/patch-include_CMakeLists.txt mysql57-client.work/files/patch-include_CMakeLists.txt --- mysql57-client.orig/files/patch-include_CMakeLists.txt 2016-02-04 00:11:17.000000000 +0100 +++ mysql57-client.work/files/patch-include_CMakeLists.txt 2016-02-09 15:41:26.142102000 +0100 @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- include/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ include/CMakeLists.txt -@@ -37,6 +37,7 @@ SET(HEADERS_ABI +@@ -38,6 +38,7 @@ SET(HEADERS_ABI SET(HEADERS ${HEADERS_ABI} @@ -8,4 +8,3 @@ my_dbug.h m_string.h my_sys.h - diff -Naur mysql57-client.orig/files/patch-include_my__compare.h mysql57-client.work/files/patch-include_my__compare.h --- mysql57-client.orig/files/patch-include_my__compare.h 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-include_my__compare.h 2016-02-09 15:41:26.144263000 +0100 @@ -1,4 +1,4 @@ ---- include/my_compare.h.orig 2015-11-29 19:16:24 UTC +--- include/my_compare.h.orig 2016-02-01 23:31:58 UTC +++ include/my_compare.h @@ -40,7 +40,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. diff -Naur mysql57-client.orig/files/patch-include_myisam.h mysql57-client.work/files/patch-include_myisam.h --- mysql57-client.orig/files/patch-include_myisam.h 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-client.work/files/patch-include_myisam.h 2016-02-09 15:41:26.146410000 +0100 @@ -1,4 +1,4 @@ ---- include/myisam.h.orig 2015-11-29 19:16:24 UTC +--- include/myisam.h.orig 2016-02-01 23:31:58 UTC +++ include/myisam.h @@ -45,7 +45,7 @@ extern "C" { The following defines can be increased if necessary. diff -Naur mysql57-client.orig/files/patch-libmysql_CMakeLists.txt mysql57-client.work/files/patch-libmysql_CMakeLists.txt --- mysql57-client.orig/files/patch-libmysql_CMakeLists.txt 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-libmysql_CMakeLists.txt 2016-02-09 15:41:26.148578000 +0100 @@ -1,4 +1,4 @@ ---- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- libmysql/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ libmysql/CMakeLists.txt @@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED) COMPONENT SharedLibraries) diff -Naur mysql57-client.orig/files/patch-man_CMakeLists.txt mysql57-client.work/files/patch-man_CMakeLists.txt --- mysql57-client.orig/files/patch-man_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-client.work/files/patch-man_CMakeLists.txt 2016-02-09 15:41:26.150748000 +0100 @@ -1,4 +1,4 @@ ---- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- man/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ man/CMakeLists.txt @@ -14,11 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff -Naur mysql57-client.orig/files/patch-mysys__ssl_my__default.cc mysql57-client.work/files/patch-mysys__ssl_my__default.cc --- mysql57-client.orig/files/patch-mysys__ssl_my__default.cc 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-mysys__ssl_my__default.cc 2016-02-09 15:41:26.152923000 +0100 @@ -1,4 +1,4 @@ ---- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC +--- mysys_ssl/my_default.cc.orig 2016-02-01 23:31:58 UTC +++ mysys_ssl/my_default.cc @@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; diff -Naur mysql57-client.orig/files/patch-scripts_CMakeLists.txt mysql57-client.work/files/patch-scripts_CMakeLists.txt --- mysql57-client.orig/files/patch-scripts_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-client.work/files/patch-scripts_CMakeLists.txt 2016-02-09 15:41:26.155086000 +0100 @@ -1,4 +1,4 @@ ---- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- scripts/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ scripts/CMakeLists.txt @@ -43,6 +43,7 @@ ELSE() MESSAGE(FATAL_ERROR "Cannot concatenate files") diff -Naur mysql57-client.orig/files/patch-storage_myisam_mi__dynrec.c mysql57-client.work/files/patch-storage_myisam_mi__dynrec.c --- mysql57-client.orig/files/patch-storage_myisam_mi__dynrec.c 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-client.work/files/patch-storage_myisam_mi__dynrec.c 2016-02-09 15:41:26.157225000 +0100 @@ -1,4 +1,4 @@ ---- storage/myisam/mi_dynrec.c.orig 2015-12-14 07:39:39 UTC +--- storage/myisam/mi_dynrec.c.orig 2016-02-01 23:31:58 UTC +++ storage/myisam/mi_dynrec.c @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my DBUG_RETURN(1); diff -Naur mysql57-client.orig/files/patch-support-files_CMakeLists.txt mysql57-client.work/files/patch-support-files_CMakeLists.txt --- mysql57-client.orig/files/patch-support-files_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-client.work/files/patch-support-files_CMakeLists.txt 2016-02-09 15:41:26.159394000 +0100 @@ -1,4 +1,4 @@ ---- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- support-files/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ support-files/CMakeLists.txt @@ -44,14 +44,17 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) diff -Naur mysql57-client.orig/pkg-plist mysql57-client.work/pkg-plist --- mysql57-client.orig/pkg-plist 2016-02-04 00:11:17.000000000 +0100 +++ mysql57-client.work/pkg-plist 2016-02-09 15:30:52.768531000 +0100 @@ -53,6 +53,8 @@ include/mysql/mysql/plugin_ftparser.h include/mysql/mysql/plugin_ftparser.h.pp include/mysql/mysql/plugin_group_replication.h +include/mysql/mysql/plugin_keyring.h +include/mysql/mysql/plugin_keyring.h.pp include/mysql/mysql/plugin_trace.h include/mysql/mysql/plugin_validate_password.h include/mysql/mysql/psi/mysql_file.h @@ -75,6 +77,7 @@ include/mysql/mysql/service_my_plugin_log.h include/mysql/mysql/service_my_snprintf.h include/mysql/mysql/service_mysql_alloc.h +include/mysql/mysql/service_mysql_keyring.h include/mysql/mysql/service_mysql_password_policy.h include/mysql/mysql/service_mysql_string.h include/mysql/mysql/service_parser.h @@ -103,6 +106,7 @@ include/mysql/plugin_audit.h include/mysql/plugin_ftparser.h include/mysql/plugin_group_replication.h +include/mysql/plugin_keyring.h include/mysql/plugin_validate_password.h include/mysql/sql_common.h include/mysql/sql_state.h