diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:00:18 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:00:18 +0000 |
| commit | 8e2b429602e6eadaeeec8f00a8cddd19cd51e299 (patch) | |
| tree | 98e8a93ad1397c83d363bfe2cea04c38306f09e5 | |
| parent | 44e231554b5f4b3f77335e8e05101522dff5ccd4 (diff) | |
Notes
48 files changed, 0 insertions, 1505 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile deleted file mode 100644 index 67b1d94224c7..000000000000 --- a/databases/mysql57-client/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>" -# $FreeBSD$ - -PORTNAME= mysql -PKGNAMESUFFIX= 57-client - -COMMENT= Multithreaded SQL database (client) - -LICENSE+= LGPL21 - -MASTERDIR= ${.CURDIR}/../mysql57-server - -PKGMESSAGE= ${.CURDIR}/pkg-message -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-* - -CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ - -DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \ - -DWITHOUT_SERVER=1 \ - -DWITH_SYSTEMD=0 - -USE_LDCONFIG+= ${PREFIX}/lib/mysql - -MMAN1= 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 - -CLIENT_ONLY= yes - -.include "${MASTERDIR}/Makefile" 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() diff --git a/databases/mysql57-client/pkg-message b/databases/mysql57-client/pkg-message deleted file mode 100644 index 0e53a2bace9c..000000000000 --- a/databases/mysql57-client/pkg-message +++ /dev/null @@ -1,6 +0,0 @@ -* * * * * * * * * * * * * * * * * * * * * * * * - -This is the mysql CLIENT without the server. -for complete server and client, please install databases/mysql57-server - -* * * * * * * * * * * * * * * * * * * * * * * * diff --git a/databases/mysql57-client/pkg-plist b/databases/mysql57-client/pkg-plist deleted file mode 100644 index c27500c1bf15..000000000000 --- a/databases/mysql57-client/pkg-plist +++ /dev/null @@ -1,131 +0,0 @@ -bin/mysql -bin/mysql_config -bin/mysql_config_editor -bin/mysql_ssl_rsa_setup -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysqldump -bin/mysqlimport -bin/mysqlpump -bin/mysqlshow -bin/mysqlslap -include/mysql/big_endian.h -include/mysql/byte_order_generic.h -include/mysql/byte_order_generic_x86.h -include/mysql/decimal.h -include/mysql/errmsg.h -include/mysql/hash.h -include/mysql/keycache.h -include/mysql/little_endian.h -include/mysql/m_ctype.h -include/mysql/m_string.h -include/mysql/my_alloc.h -include/mysql/my_byteorder.h -include/mysql/my_command.h -include/mysql/my_compiler.h -include/mysql/my_config.h -include/mysql/my_dbug.h -include/mysql/my_dir.h -include/mysql/my_getopt.h -include/mysql/my_global.h -include/mysql/my_list.h -include/mysql/my_sys.h -include/mysql/my_thread.h -include/mysql/my_thread_local.h -include/mysql/my_xml.h -include/mysql/mysql.h -include/mysql/mysql/client_authentication.h -include/mysql/mysql/client_plugin.h -include/mysql/mysql/client_plugin.h.pp -include/mysql/mysql/com_data.h -include/mysql/mysql/get_password.h -include/mysql/mysql/group_replication_priv.h -include/mysql/mysql/innodb_priv.h -include/mysql/mysql/mysql_lex_string.h -include/mysql/mysql/plugin.h -include/mysql/mysql/plugin_audit.h -include/mysql/mysql/plugin_audit.h.pp -include/mysql/mysql/plugin_auth.h -include/mysql/mysql/plugin_auth.h.pp -include/mysql/mysql/plugin_auth_common.h -include/mysql/mysql/plugin_ftparser.h -include/mysql/mysql/plugin_ftparser.h.pp -include/mysql/mysql/plugin_group_replication.h -include/mysql/mysql/plugin_trace.h -include/mysql/mysql/plugin_validate_password.h -include/mysql/mysql/psi/mysql_file.h -include/mysql/mysql/psi/mysql_idle.h -include/mysql/mysql/psi/mysql_mdl.h -include/mysql/mysql/psi/mysql_memory.h -include/mysql/mysql/psi/mysql_ps.h -include/mysql/mysql/psi/mysql_socket.h -include/mysql/mysql/psi/mysql_sp.h -include/mysql/mysql/psi/mysql_stage.h -include/mysql/mysql/psi/mysql_statement.h -include/mysql/mysql/psi/mysql_table.h -include/mysql/mysql/psi/mysql_thread.h -include/mysql/mysql/psi/mysql_transaction.h -include/mysql/mysql/psi/psi.h -include/mysql/mysql/psi/psi_base.h -include/mysql/mysql/psi/psi_memory.h -include/mysql/mysql/service_command.h -include/mysql/mysql/service_locking.h -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_password_policy.h -include/mysql/mysql/service_mysql_string.h -include/mysql/mysql/service_parser.h -include/mysql/mysql/service_rpl_transaction_ctx.h -include/mysql/mysql/service_rpl_transaction_write_set.h -include/mysql/mysql/service_rules_table.h -include/mysql/mysql/service_security_context.h -include/mysql/mysql/service_srv_session.h -include/mysql/mysql/service_srv_session_info.h -include/mysql/mysql/service_thd_alloc.h -include/mysql/mysql/service_thd_engine_lock.h -include/mysql/mysql/service_thd_wait.h -include/mysql/mysql/service_thread_scheduler.h -include/mysql/mysql/services.h -include/mysql/mysql/services.h.pp -include/mysql/mysql/thread_pool_priv.h -include/mysql/mysql/thread_type.h -include/mysql/mysql_com.h -include/mysql/mysql_com_server.h -include/mysql/mysql_embed.h -include/mysql/mysql_time.h -include/mysql/mysql_version.h -include/mysql/mysqld_ername.h -include/mysql/mysqld_error.h -include/mysql/plugin.h -include/mysql/plugin_audit.h -include/mysql/plugin_ftparser.h -include/mysql/plugin_group_replication.h -include/mysql/plugin_validate_password.h -include/mysql/sql_common.h -include/mysql/sql_state.h -include/mysql/sslopt-case.h -include/mysql/sslopt-longopts.h -include/mysql/sslopt-vars.h -include/mysql/thr_cond.h -include/mysql/thr_mutex.h -include/mysql/thr_rwlock.h -include/mysql/typelib.h -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.20 -lib/mysql/libmysqlservices.a -libdata/pkgconfig/mysqlclient.pc -man/man1/comp_err.1.gz -man/man1/mysql.1.gz -man/man1/mysql_config.1.gz -man/man1/mysql_config_editor.1.gz -man/man1/mysqladmin.1.gz -man/man1/mysqlbinlog.1.gz -man/man1/mysqlcheck.1.gz -man/man1/mysqldump.1.gz -man/man1/mysqlimport.1.gz -man/man1/mysqlshow.1.gz -man/man1/mysqlslap.1.gz -share/aclocal/mysql.m4 diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile deleted file mode 100644 index 8d891a3b7c0c..000000000000 --- a/databases/mysql57-server/Makefile +++ /dev/null @@ -1,127 +0,0 @@ -# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>" -# $FreeBSD$ - -PORTNAME= mysql -PORTVERSION= 5.7.10 -PORTREVISION= 1 -CATEGORIES= databases ipv6 -MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost -PKGNAMESUFFIX?= 57-server -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost - -MAINTAINER= mokhi64@gmail.com -COMMENT= Multithreaded SQL database (server) - -LICENSE= GPLv2 - -SLAVEDIRS= databases/mysql57-client -USES= cmake:outsource shebangfix - -OPTIONS_RADIO= SSL -OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL -OPTIONS_DEFAULT+= OPENSSL -NO_OPTIONS_SORT= yes - -BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL -WITHOUT_SSL_DESC= No SSL/TLS support - -CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ - -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ - -DINSTALL_INCLUDEDIR="include/mysql" \ - -DINSTALL_INFODIR="info" \ - -DINSTALL_LIBDIR="lib/mysql" \ - -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ - -DINSTALL_MANDIR="man" \ - -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ - -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ - -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ - -DINSTALL_SBINDIR="libexec" \ - -DINSTALL_SCRIPTDIR="bin" \ - -DINSTALL_SHAREDIR="share" \ - -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \ - -DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \ - -DWITH_INNODB_EXTRA_DEBUG=0 - -SHEBANG_FILES= scripts/*.pl* scripts/*.sh - -.ifdef USE_MYSQL -.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. -.endif - -BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled -OPENSSL_USE= OPENSSL=yes -WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no - -# MySQL-Server part -.if !defined(CLIENT_ONLY) -USE_MYSQL= yes -WANT_MYSQL_VER= 57 - -USES+= bison:build cpe perl5 -USE_PERL5= run - -CONFLICTS_INSTALL= mariadb[0-9]*-server-* \ - mysql[0-46-9][0-689]-server-* \ - percona[0-9]*-server-* - -USE_RC_SUBR= mysql-server - -USERS= mysql -GROUPS= mysql - -USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin - -MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ - mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ - mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ - mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ - mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ - mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 - -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" - -OPTIONS_GROUP= STORAGE -OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA -STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) -ARCHIVE_DESC= Compile "Archive Storage" statically in server -BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server -EXAMPLE_DESC= Compile "Example Storage" statically in server -FEDERATED_DESC= Compile "Federated Storage" statically in server -INNOBASE_DESC= Compile "InnoDB Storage" statically in server -PARTITION_DESC= Compile "Partitioning support Storage" statically in server -PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server - -ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 -BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 -FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 -INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 -PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 -PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 - -.else -USES+= readline -.endif - -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -CC= clang -CXX= clang++ -CPP= clang-cpp -OPENSSL_CMAKE_ON= -DWITH_SSL=system -.elif ${OSVERSION} >= 1000000 -OPENSSL_CMAKE_ON= -DWITH_SSL=yes -.endif - -USE_CLANG= 3.3+ - -post-extract: - ${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h - -post-patch: - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt - -.include <bsd.port.post.mk> diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo deleted file mode 100644 index 4bbc0e948069..000000000000 --- a/databases/mysql57-server/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 -SIZE (mysql-5.7.10.tar.gz) = 48919371 -SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac -SIZE (boost_1_59_0.tar.gz) = 83709983 diff --git a/databases/mysql57-server/files/extra-patch-config.h.cmake b/databases/mysql57-server/files/extra-patch-config.h.cmake deleted file mode 100644 index 3ac1add1b9ce..000000000000 --- a/databases/mysql57-server/files/extra-patch-config.h.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.cmake.orig 2014-12-05 16:24:02 UTC -+++ config.h.cmake -@@ -151,7 +151,8 @@ - #cmakedefine HAVE_FESETROUND 1 - #cmakedefine HAVE_FINITE 1 - #cmakedefine HAVE_FP_EXCEPT 1 --#cmakedefine HAVE_FPSETMASK 1 -+#cmakedefine HAVE_FPSETMASK 0 -+#cmakedefine HAVE_FEDISABLEEXCEPT 1 - #cmakedefine HAVE_FSEEKO 1 - #cmakedefine HAVE_FSYNC 1 - #cmakedefine HAVE_FTIME 1 diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in deleted file mode 100644 index 037310374cb1..000000000000 --- a/databases/mysql57-server/files/mysql-server.in +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. -# mysql_dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_pidfile (str): Custum PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -mysql_user="mysql" -mysql_limits_args="-e -U ${mysql_user}" -: ${hostname:=`/bin/hostname`} -pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} -command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} -} - -mysql_prestart() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null - else - return 0 - fi -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mysql57-server/files/patch-CMakeLists.txt b/databases/mysql57-server/files/patch-CMakeLists.txt deleted file mode 100644 index ad3a6a0d9bf4..000000000000 --- a/databases/mysql57-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ CMakeLists.txt -@@ -577,12 +577,10 @@ IF(UNIX) - ENDIF() - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(testclients) - ADD_SUBDIRECTORY(sql) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) - ENDIF() - -@@ -591,8 +589,6 @@ ENDIF() - ADD_SUBDIRECTORY(scripts) - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) -@@ -647,6 +643,7 @@ 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 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE - ) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mysql57-server/files/patch-client_CMakeLists.txt b/databases/mysql57-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index e8f06254e2ca..000000000000 --- a/databases/mysql57-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ ---- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ client/CMakeLists.txt -@@ -38,8 +38,6 @@ ADD_DEFINITIONS( - - ## Subdirectory with common client code. - ADD_SUBDIRECTORY(base) --## Subdirectory for mysqlpump code. --ADD_SUBDIRECTORY(dump) - - ## We will need libeay32.dll and ssleay32.dll when running client executables. - COPY_OPENSSL_DLLS(copy_openssl_client) -@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F - ENDIF() - - ADD_DEFINITIONS(${SSL_DEFINES}) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) - IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) -+ENDIF() - - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) - -@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( - mysqlbinlog.cc -@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli - - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) - ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) - ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) - SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) -+ENDIF() - - # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". - IF(WIN32) -@@ -197,11 +203,6 @@ ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( - mysql_plugin -- mysqlcheck -- mysqldump -- mysqlimport -- mysqlshow -- mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mysql57-server/files/patch-cmake_plugin.cmake b/databases/mysql57-server/files/patch-cmake_plugin.cmake deleted file mode 100644 index c4e468ce5452..000000000000 --- a/databases/mysql57-server/files/patch-cmake_plugin.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/plugin.cmake.orig 2015-11-29 19:16:24 UTC -+++ cmake/plugin.cmake -@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN) - MYSQL_INSTALL_TARGETS(${target} - DESTINATION ${INSTALL_PLUGINDIR} - COMPONENT ${INSTALL_COMPONENT}) -- INSTALL_DEBUG_TARGET(${target} -- DESTINATION ${INSTALL_PLUGINDIR}/debug -- COMPONENT ${INSTALL_COMPONENT}) - # Add installed files to list for RPMs - FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" diff --git a/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h deleted file mode 100644 index 6aaba5c733f7..000000000000 --- a/databases/mysql57-server/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-server/files/patch-cmd-line-utils_libedit_vi.c b/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c deleted file mode 100644 index 0847a07c84d4..000000000000 --- a/databases/mysql57-server/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-server/files/patch-include_CMakeLists.txt b/databases/mysql57-server/files/patch-include_CMakeLists.txt deleted file mode 100644 index 6bb0dfd10172..000000000000 --- a/databases/mysql57-server/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ include/CMakeLists.txt -@@ -69,10 +69,12 @@ SET(HEADERS - ) - - INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR}) -+IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development - PATTERN "*.h" - PATTERN "psi_abi*" EXCLUDE - ) -+ENDIF() - - diff --git a/databases/mysql57-server/files/patch-include_my__compare.h b/databases/mysql57-server/files/patch-include_my__compare.h deleted file mode 100644 index cd176ca50b43..000000000000 --- a/databases/mysql57-server/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-server/files/patch-include_my__thread__os__id.h b/databases/mysql57-server/files/patch-include_my__thread__os__id.h deleted file mode 100644 index 382c3ee920f5..000000000000 --- a/databases/mysql57-server/files/patch-include_my__thread__os__id.h +++ /dev/null @@ -1,15 +0,0 @@ ---- include/my_thread_os_id.h.orig 2015-11-29 19:16:24 UTC -+++ include/my_thread_os_id.h -@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa - return pthread_getthreadid_np(); - #else - #ifdef HAVE_INTEGER_PTHREAD_SELF -+# ifdef __DragonFly__ -+ return syscall(SYS_lwp_gettid); -+# else - /* Unknown platform, fallback. */ - return pthread_self(); -+# endif - #else - /* Feature not available. */ - return 0; diff --git a/databases/mysql57-server/files/patch-include_myisam.h b/databases/mysql57-server/files/patch-include_myisam.h deleted file mode 100644 index 7a9ab13220ea..000000000000 --- a/databases/mysql57-server/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-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index 9a503132172a..000000000000 --- a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ libmysql/CMakeLists.txt -@@ -215,7 +215,7 @@ IF(WIN32) - ENDIF() - - # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) - - # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED) - # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) - IF(UNIX) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -313,6 +314,7 @@ ENDIF() - # to initialize api_calls[] array in api_test.c - # - SET(CLIENT_API_FUNCTION_LIST "") -+ ENDIF() - FOREACH(api ${CLIENT_API_FUNCTIONS}) - SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") - ENDFOREACH() diff --git a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt b/databases/mysql57-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 23471c512116..000000000000 --- a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ libservices/CMakeLists.txt -@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES - security_context_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mysql57-server/files/patch-man_CMakeLists.txt b/databases/mysql57-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index b771ae6214f0..000000000000 --- a/databases/mysql57-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ man/CMakeLists.txt -@@ -15,8 +15,6 @@ - - # 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) - IF(MAN1_FILES) diff --git a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index cb52de18bebe..000000000000 --- a/databases/mysql57-server/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-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc deleted file mode 100644 index 19877960c9b3..000000000000 --- a/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- plugin/password_validation/validate_password.cc.orig 2015-11-29 19:16:24 UTC -+++ plugin/password_validation/validate_password.cc -@@ -18,6 +18,8 @@ - #include <mysql/plugin_validate_password.h> - #include <mysql/service_my_plugin_log.h> - #include <mysql/service_mysql_string.h> -+/* solve clash between libc++ bitset::test() and test macro from my_global.h */ -+#undef test - #include <set> - #include <iostream> - #include <fstream> diff --git a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt b/databases/mysql57-server/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 8e7b3fdf37dd..000000000000 --- a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ scripts/CMakeLists.txt -@@ -347,6 +347,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,14 +432,13 @@ 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 -@@ -471,7 +472,7 @@ ELSE() - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh -- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) -+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) - ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} - ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) diff --git a/databases/mysql57-server/files/patch-sql_CMakeLists.txt b/databases/mysql57-server/files/patch-sql_CMakeLists.txt deleted file mode 100644 index e72f6719ed0e..000000000000 --- a/databases/mysql57-server/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ sql/CMakeLists.txt -@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES( - ${ZLIB_INCLUDE_DIR} - ${SSL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/sql -+ ${CMAKE_BINARY_DIR}/include -+ ${CMAKE_BINARY_DIR} - ) - - SET(CONF_SOURCES diff --git a/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc deleted file mode 100644 index cf20d3706637..000000000000 --- a/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc +++ /dev/null @@ -1,30 +0,0 @@ ---- sql/conn_handler/socket_connection.cc.orig 2015-11-29 19:16:24 UTC -+++ sql/conn_handler/socket_connection.cc -@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li - signal(SIGCHLD, SIG_DFL); - request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE, - mysql_socket_getfd(connect_sock), NULL); -- fromhost(&req); -+ void (*my_fromhost) (void *) = (void (*)(void *)) fromhost; -+ my_fromhost(&req); - -- if (!hosts_access(&req)) -+ int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access; -+ if (!my_hosts_access(&req)) - { - /* - This may be stupid but refuse() includes an exit(0) - which we surely don't want... - clean_exit() - same stupid thing ... - */ -+ char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client; - syslog(LOG_AUTH | m_deny_severity, -- "refused connect from %s", eval_client(&req)); -+ "refused connect from %s", my_eval_client(&req)); - - if (req.sink) -- (req.sink)(req.fd); -+ ((void (*)(int)) (req.sink))(req.fd); - - mysql_socket_shutdown(listen_sock, SHUT_RDWR); - mysql_socket_close(listen_sock); diff --git a/databases/mysql57-server/files/patch-sql_sql__view.cc b/databases/mysql57-server/files/patch-sql_sql__view.cc deleted file mode 100644 index 94906b28457c..000000000000 --- a/databases/mysql57-server/files/patch-sql_sql__view.cc +++ /dev/null @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2015-11-29 19:16:24 UTC -+++ sql/sql_view.cc -@@ -768,46 +768,46 @@ static const int required_view_parameter - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast<int>(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast<int>(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} diff --git a/databases/mysql57-server/files/patch-sql_sys__vars.cc b/databases/mysql57-server/files/patch-sql_sys__vars.cc deleted file mode 100644 index 7b731cbe5c5e..000000000000 --- a/databases/mysql57-server/files/patch-sql_sys__vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2015-11-29 19:16:24 UTC -+++ sql/sys_vars.cc -@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim - "connection before closing it", - SESSION_VAR(net_interactive_timeout), - CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_ulong Sys_join_buffer_size( - "join_buffer_size", -@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou - "Number of seconds to wait for more data from a connection before " - "aborting the read", - SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_read_timeout)); - -@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo - "Number of seconds to wait for a block to be written to a connection " - "before aborting the write", - SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_write_timeout)); - -@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou - "The number of seconds the server waits for activity on a " - "connection before closing it", - SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32/1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_plugin Sys_default_storage_engine( diff --git a/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h b/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h deleted file mode 100644 index 598981a5e0ab..000000000000 --- a/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/innobase/include/srv0mon.h.orig 2015-11-29 19:16:24 UTC -+++ storage/innobase/include/srv0mon.h -@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang - /* Required for FreeBSD so that INT64_MAX is defined. */ - #define __STDC_LIMIT_MACROS - #endif /* __STDC_LIMIT_MACROS */ -+#ifdef __DragonFly__ -+/* The hack above doen't work for dragonfly, stdint.h already imported */ -+#include <machine/int_limits.h> -+#endif - - #include <stdint.h> - diff --git a/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c deleted file mode 100644 index 57398630640b..000000000000 --- a/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c +++ /dev/null @@ -1,23 +0,0 @@ ---- storage/myisam/mi_dynrec.c.orig 2015-11-29 19:16:24 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-server/files/patch-support-files_CMakeLists.txt b/databases/mysql57-server/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index f429986920cc..000000000000 --- a/databases/mysql57-server/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ support-files/CMakeLists.txt -@@ -69,7 +69,9 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() - -+IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ENDIF() - CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) - - SET(bindir ${prefix}/${INSTALL_BINDIR}) diff --git a/databases/mysql57-server/pkg-descr b/databases/mysql57-server/pkg-descr deleted file mode 100644 index 8f4acf36e853..000000000000 --- a/databases/mysql57-server/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -MySQL is a very fast, multi-threaded, multi-user and robust SQL -(Structured Query Language) database server. - -WWW: http://www.mysql.com/ diff --git a/databases/mysql57-server/pkg-message b/databases/mysql57-server/pkg-message deleted file mode 100644 index 71d00aa80526..000000000000 --- a/databases/mysql57-server/pkg-message +++ /dev/null @@ -1,6 +0,0 @@ -************************************************************************ - -Remember to run mysql_upgrade the first time you start the MySQL server -after an upgrade from an earlier version. - -************************************************************************ diff --git a/databases/mysql57-server/pkg-plist b/databases/mysql57-server/pkg-plist deleted file mode 100644 index 0f57789bb2b5..000000000000 --- a/databases/mysql57-server/pkg-plist +++ /dev/null @@ -1,153 +0,0 @@ -bin/innochecksum -bin/lz4_decompress -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -bin/mysql_install_db -bin/mysql_plugin -bin/mysql_secure_installation -bin/mysql_tzinfo_to_sql -bin/mysql_upgrade -bin/mysqld_multi -bin/mysqld_safe -bin/mysqldumpslow -bin/mysqltest -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip -bin/zlib_decompress -include/mysql/binary_log_types.h -lib/mysql/libmysqld.a -lib/mysql/plugin/adt_null.so -lib/mysql/plugin/auth.so -lib/mysql/plugin/auth_test_plugin.so -lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/ha_example.so -lib/mysql/plugin/libdaemon_example.so -lib/mysql/plugin/libtest_framework.so -lib/mysql/plugin/libtest_services.so -lib/mysql/plugin/libtest_services_threaded.so -lib/mysql/plugin/libtest_session_detach.so -lib/mysql/plugin/libtest_session_in_thd.so -lib/mysql/plugin/libtest_session_info.so -lib/mysql/plugin/libtest_sql_2_sessions.so -lib/mysql/plugin/libtest_sql_all_col_types.so -lib/mysql/plugin/libtest_sql_cmds_1.so -lib/mysql/plugin/libtest_sql_commit.so -lib/mysql/plugin/libtest_sql_complex.so -lib/mysql/plugin/libtest_sql_errors.so -lib/mysql/plugin/libtest_sql_lock.so -lib/mysql/plugin/libtest_sql_processlist.so -lib/mysql/plugin/libtest_sql_replication.so -lib/mysql/plugin/libtest_sql_shutdown.so -lib/mysql/plugin/libtest_sql_sqlmode.so -lib/mysql/plugin/libtest_sql_stored_procedures_functions.so -lib/mysql/plugin/libtest_sql_views_triggers.so -lib/mysql/plugin/libtest_x_sessions_deinit.so -lib/mysql/plugin/libtest_x_sessions_init.so -lib/mysql/plugin/locking_service.so -lib/mysql/plugin/mypluglib.so -lib/mysql/plugin/mysql_no_login.so -lib/mysql/plugin/qa_auth_client.so -lib/mysql/plugin/qa_auth_interface.so -lib/mysql/plugin/qa_auth_server.so -lib/mysql/plugin/replication_observers_example_plugin.so -lib/mysql/plugin/rewrite_example.so -lib/mysql/plugin/rewriter.so -lib/mysql/plugin/semisync_master.so -lib/mysql/plugin/semisync_slave.so -lib/mysql/plugin/test_security_context.so -lib/mysql/plugin/validate_password.so -lib/mysql/plugin/version_token.so -libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc -libexec/mysqld -man/man1/my_print_defaults.1.gz -man/man1/myisam_ftdump.1.gz -man/man1/myisamchk.1.gz -man/man1/myisamlog.1.gz -man/man1/myisampack.1.gz -man/man1/mysql.server.1.gz -man/man1/mysql_install_db.1.gz -man/man1/mysql_plugin.1.gz -man/man1/mysql_secure_installation.1.gz -man/man1/mysql_tzinfo_to_sql.1.gz -man/man1/mysql_upgrade.1.gz -man/man1/mysqld_multi.1.gz -man/man1/mysqld_safe.1.gz -man/man1/mysqldumpslow.1.gz -man/man1/mysqlman.1.gz -man/man1/mysqltest.1.gz -man/man1/perror.1.gz -man/man1/replace.1.gz -man/man1/resolve_stack_dump.1.gz -man/man1/resolveip.1.gz -man/man8/mysqld.8.gz -%%DATADIR%%/bulgarian/errmsg.sys -%%DATADIR%%/charsets/Index.xml -%%DATADIR%%/charsets/README -%%DATADIR%%/charsets/armscii8.xml -%%DATADIR%%/charsets/ascii.xml -%%DATADIR%%/charsets/cp1250.xml -%%DATADIR%%/charsets/cp1251.xml -%%DATADIR%%/charsets/cp1256.xml -%%DATADIR%%/charsets/cp1257.xml -%%DATADIR%%/charsets/cp850.xml -%%DATADIR%%/charsets/cp852.xml -%%DATADIR%%/charsets/cp866.xml -%%DATADIR%%/charsets/dec8.xml -%%DATADIR%%/charsets/geostd8.xml -%%DATADIR%%/charsets/greek.xml -%%DATADIR%%/charsets/hebrew.xml -%%DATADIR%%/charsets/hp8.xml -%%DATADIR%%/charsets/keybcs2.xml -%%DATADIR%%/charsets/koi8r.xml -%%DATADIR%%/charsets/koi8u.xml -%%DATADIR%%/charsets/latin1.xml -%%DATADIR%%/charsets/latin2.xml -%%DATADIR%%/charsets/latin5.xml -%%DATADIR%%/charsets/latin7.xml -%%DATADIR%%/charsets/macce.xml -%%DATADIR%%/charsets/macroman.xml -%%DATADIR%%/charsets/swe7.xml -%%DATADIR%%/czech/errmsg.sys -%%DATADIR%%/danish/errmsg.sys -%%DATADIR%%/dictionary.txt -%%DATADIR%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg-utf8.txt -%%DATADIR%%/estonian/errmsg.sys -%%DATADIR%%/fill_help_tables.sql -%%DATADIR%%/french/errmsg.sys -%%DATADIR%%/german/errmsg.sys -%%DATADIR%%/greek/errmsg.sys -%%DATADIR%%/hungarian/errmsg.sys -%%DATADIR%%/innodb_memcached_config.sql -%%DATADIR%%/install_rewriter.sql -%%DATADIR%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%DATADIR%%/magic -%%DATADIR%%/my-default.cnf -%%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql.server -%%DATADIR%%/mysql_security_commands.sql -%%DATADIR%%/mysql_sys_schema.sql -%%DATADIR%%/mysql_system_tables.sql -%%DATADIR%%/mysql_system_tables_data.sql -%%DATADIR%%/mysql_test_data_timezone.sql -%%DATADIR%%/mysqld_multi.server -%%DATADIR%%/norwegian-ny/errmsg.sys -%%DATADIR%%/norwegian/errmsg.sys -%%DATADIR%%/polish/errmsg.sys -%%DATADIR%%/portuguese/errmsg.sys -%%DATADIR%%/romanian/errmsg.sys -%%DATADIR%%/russian/errmsg.sys -%%DATADIR%%/serbian/errmsg.sys -%%DATADIR%%/slovak/errmsg.sys -%%DATADIR%%/spanish/errmsg.sys -%%DATADIR%%/swedish/errmsg.sys -%%DATADIR%%/ukrainian/errmsg.sys -%%DATADIR%%/uninstall_rewriter.sql |