Date: Sun, 10 Jan 2016 20:02:30 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405741 - in head/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files Message-ID: <201601102002.u0AK2UA1038723@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Jan 10 20:02:30 2016 New Revision: 405741 URL: https://svnweb.freebsd.org/changeset/ports/405741 Log: databases/mysql57-client, databases/mysql57-server: re-add for proper repo-copy PR: 204607 Added: head/databases/mysql57-client/ - copied from r405739, head/databases/mysql56-client/ head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake (contents, props changed) head/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake (contents, props changed) head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h (contents, props changed) head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c (contents, props changed) head/databases/mysql57-client/files/patch-include_CMakeLists.txt (contents, props changed) head/databases/mysql57-client/files/patch-include_my__compare.h (contents, props changed) head/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt (contents, props changed) head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc (contents, props changed) head/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c (contents, props changed) head/databases/mysql57-server/ - copied from r405739, head/databases/mysql56-server/ head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h (contents, props changed) head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c (contents, props changed) head/databases/mysql57-server/files/patch-include_my__compare.h (contents, props changed) head/databases/mysql57-server/files/patch-include_my__thread__os__id.h (contents, props changed) head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc (contents, props changed) head/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc (contents, props changed) head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc (contents, props changed) head/databases/mysql57-server/files/patch-sql_sql__view.cc (contents, props changed) head/databases/mysql57-server/files/patch-sql_sys__vars.cc (contents, props changed) head/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h (contents, props changed) head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c (contents, props changed) Deleted: head/databases/mysql57-client/files/patch-cmake_build_configurations_compiler_options.cmake head/databases/mysql57-client/files/patch-include-CMakeLists.txt head/databases/mysql57-client/files/patch-include_my_compare.h head/databases/mysql57-client/files/patch-mysys_ssl_my_default.cc head/databases/mysql57-server/files/patch-extra_CMakeLists.txt head/databases/mysql57-server/files/patch-include_my_compare.h head/databases/mysql57-server/files/patch-mysys_ssl_my_default.cc head/databases/mysql57-server/files/patch-plugin_password_validation_validate_password.cc head/databases/mysql57-server/files/patch-scripts_mysqld_safe.sh head/databases/mysql57-server/files/patch-sql_sql_trigger.cc head/databases/mysql57-server/files/patch-sql_sql_view.cc head/databases/mysql57-server/files/patch-sql_sys_vars.cc Added: head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,20 @@ +--- 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}") Added: head/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,27 @@ +--- 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() Added: head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,11 @@ +--- 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 Added: head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,20 @@ +--- 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; + Added: head/databases/mysql57-client/files/patch-include_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-include_CMakeLists.txt Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,18 @@ +--- 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" Added: head/databases/mysql57-client/files/patch-include_my__compare.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-include_my__compare.h Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,11 @@ +--- 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) Added: head/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,11 @@ +--- 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 Added: head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,31 @@ +--- 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. Added: head/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,23 @@ +--- 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) + { Added: head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,11 @@ +--- 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 Added: head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,20 @@ +--- 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; + Added: head/databases/mysql57-server/files/patch-include_my__compare.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-include_my__compare.h Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,11 @@ +--- 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) Added: head/databases/mysql57-server/files/patch-include_my__thread__os__id.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-include_my__thread__os__id.h Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,15 @@ +--- 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; Added: head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,31 @@ +--- 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. Added: head/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,11 @@ +--- 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> Added: head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,30 @@ +--- 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); Added: head/databases/mysql57-server/files/patch-sql_sql__view.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-sql_sql__view.cc Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,63 @@ +--- 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} Added: head/databases/mysql57-server/files/patch-sql_sys__vars.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-sql_sys__vars.cc Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,38 @@ +--- 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( Added: head/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,13 @@ +--- 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> + Added: head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c Sun Jan 10 20:02:30 2016 (r405741) @@ -0,0 +1,23 @@ +--- 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) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601102002.u0AK2UA1038723>