databases/mysql57-client, databases/mysql57-server:

        remove to prepare for proper repo-copy

PR:		204607

16 files changed, 0 insertions, 421 deletions

diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 4e9091fae53e..000000000000
--- a/databases/mysql57-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ CMakeLists.txt
-@@ -569,8 +569,8 @@ ENDIF()
- 
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
- 
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
-@@ -639,14 +639,13 @@ ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 5b0e752138e7..000000000000
--- a/databases/mysql57-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
---- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ client/CMakeLists.txt
-@@ -121,6 +121,7 @@ IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-     upgrade/program.cc
-@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
-+ENDIF()
- 
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
-@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- ADD_COMPILE_FLAGS(
-@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-+ENDIF()
- 
- IF(UNIX AND NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -196,7 +204,6 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
--  mysql_plugin
-   mysqlcheck
-   mysqldump
-   mysqlimport
diff --git a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
deleted file mode 100644
index bf275e9893cb..000000000000
--- a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2015-11-29 19:16:24 UTC
-+++ cmake/build_configurations/compiler_options.cmake
-@@ -28,7 +28,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
-   IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
-@@ -37,7 +37,7 @@ IF(UNIX)  
-     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
--    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")
diff --git a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake b/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
deleted file mode 100644
index 7e94978023f1..000000000000
--- a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
---- cmake/os/DragonFly.cmake.orig	2015-12-17 10:53:10 UTC
-+++ cmake/os/DragonFly.cmake
-@@ -0,0 +1,24 @@
-+INCLUDE(CheckCSourceRuns)
-+
-+# We require at least GCC 4.4 or Clang 3.3.
-+IF(NOT FORCE_UNSUPPORTED_COMPILER)
-+  IF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-+  ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ < 3) ||
-+               (__clang_major__ == 3 && __clang_minor__ < 3);
-+      }" HAVE_SUPPORTED_CLANG_VERSION)
-+    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-+      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-+    ENDIF()
-+  ELSE()
-+    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+  ENDIF()
-+ENDIF()
diff --git a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
deleted file mode 100644
index 6aaba5c733f7..000000000000
--- a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmd-line-utils/libedit/chartype.h.orig	2015-11-29 19:16:24 UTC
-+++ cmd-line-utils/libedit/chartype.h
-@@ -49,7 +49,7 @@
-   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
- #if !defined(__NetBSD__) && !defined(__sun) \
-   && !(defined(__APPLE__) && defined(__MACH__)) \
--  && !defined(__FreeBSD__) && !defined(_AIX)
-+  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
- #ifndef __STDC_ISO_10646__
- /* In many places it is assumed that the first 127 code points are ASCII
-  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
diff --git a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c b/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
deleted file mode 100644
index 0847a07c84d4..000000000000
--- a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmd-line-utils/libedit/vi.c.orig	2015-11-29 19:16:24 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
-  * this is against historical precedent...
-  */
--#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- __weakref_visible char *my_get_alias_text(const char *)
-     __weak_reference(get_alias_text);
- #endif
-@@ -928,7 +928,7 @@ protected el_action_t
- vi_alias(EditLine *el __attribute__((__unused__)),
- 	 Int c __attribute__((__unused__)))
- {
--#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- 	char alias_name[3];
- 	char *alias_text;
- 
diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 185a6f785e69..000000000000
--- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- extra/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ extra/CMakeLists.txt
-@@ -45,6 +45,7 @@ ENDIF()
- 
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
-                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
-+                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
-                    COMMAND comp_err
-                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
-                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
-@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
- ENDIF()
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- ENDIF()
-+ENDIF()
- 
- # In published release builds on Solaris, we need to bundle gcc source.
- # PB2 will take care of putting it in extra/ when needed
diff --git a/databases/mysql57-client/files/patch-include_CMakeLists.txt b/databases/mysql57-client/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 4bc34cb951c1..000000000000
--- a/databases/mysql57-client/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ include/CMakeLists.txt
-@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
- 
- SET(HEADERS 
-   ${HEADERS_ABI} 
-+  hash.h
-   my_dbug.h 
-   m_string.h
-   my_sys.h 
-@@ -68,7 +69,6 @@ SET(HEADERS 
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
--INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
diff --git a/databases/mysql57-client/files/patch-include_my__compare.h b/databases/mysql57-client/files/patch-include_my__compare.h
deleted file mode 100644
index cd176ca50b43..000000000000
--- a/databases/mysql57-client/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2015-11-29 19:16:24 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.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql57-client/files/patch-include_myisam.h b/databases/mysql57-client/files/patch-include_myisam.h
deleted file mode 100644
index 7a9ab13220ea..000000000000
--- a/databases/mysql57-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2015-11-29 19:16:24 UTC
-+++ include/myisam.h
-@@ -45,7 +45,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index d4a6ee54a7e6..000000000000
--- a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ libmysql/CMakeLists.txt
-@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
-     COMPONENT SharedLibraries)
-   IF(UNIX)
-     # libtool compatability
--    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-     ELSE()
-       SET(OS_SHARED_LIB_VERSION
diff --git a/databases/mysql57-client/files/patch-man_CMakeLists.txt b/databases/mysql57-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 617676556213..000000000000
--- a/databases/mysql57-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ man/CMakeLists.txt
-@@ -14,11 +14,7 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
- # Copy man pages
--FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
-+FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1  mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1  mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index cb52de18bebe..000000000000
--- a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2015-11-29 19:16:24 UTC
-+++ mysys_ssl/my_default.cc
-@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -1409,7 +1409,10 @@ static const char **init_default_directo
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
-@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 7bbaae22bbcf..000000000000
--- a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
---- scripts/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ scripts/CMakeLists.txt
-@@ -43,6 +43,7 @@ ELSE()
-   MESSAGE(FATAL_ERROR "Cannot concatenate files")
- ENDIF()
- 
-+IF(FALSE)
- # Build mysql_fix_privilege_tables.c
- ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
-@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
-   ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
- )
-+ENDIF()
- 
- # If we do not have performance schema compiled in then sys will not work,
- # so only create an empty sys database with an auto-generated file,
-@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER)
-   )
- ENDIF()
- 
-+IF(FALSE)
- 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)
-   INSTALL(FILES
-@@ -347,6 +351,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} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         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}")
diff --git a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
deleted file mode 100644
index 9305f2ba7f93..000000000000
--- a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- storage/myisam/mi_dynrec.c.orig	2015-12-14 07:39:39 UTC
-+++ storage/myisam/mi_dynrec.c
-@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
-     DBUG_RETURN(1);
-   }
-   /*
--    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
--    MAP_NORESERVE
--      Do not reserve swap space for this mapping. When swap space is
--      reserved, one has the guarantee that it is possible to modify the
--      mapping. When swap space is not reserved one might get SIGSEGV
--      upon a write if no physical memory is available.
-+    MAP_NORESERVE is unimplemented in FreeBSD
-   */
-   info->s->file_map= (uchar*)
-                   my_mmap(0, (size_t) size,
-                           info->s->mode==O_RDONLY ? PROT_READ :
-                           PROT_READ | PROT_WRITE,
--                          MAP_SHARED | MAP_NORESERVE,
-+                          MAP_SHARED,
-                           info->dfile, 0L);
-   if (info->s->file_map == (uchar*) MAP_FAILED)
-   {
diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 29eb39c02628..000000000000
--- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- support-files/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ support-files/CMakeLists.txt
-@@ -44,14 +44,17 @@ ELSE()
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- SET(inifile my-default)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-         DESTINATION ${inst_location} COMPONENT IniFiles)
-+ENDIF()
- 
- IF(UNIX)
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,8 +71,10 @@ IF(UNIX)
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
-+ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   
-   SET(bindir ${prefix}/${INSTALL_BINDIR})
-@@ -84,3 +89,4 @@ IF(UNIX)
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()