diff --git a/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch b/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch deleted file mode 100644 index 77278da1f5c76043d8ce8b3dafbff5f1096c87e0..0000000000000000000000000000000000000000 --- a/debian/patches/0025-Change-the-default-optimization-from-O3-to-O2-in-mys.patch +++ /dev/null @@ -1,89 +0,0 @@ -From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= -Date: Wed, 22 Nov 2017 20:32:51 +0000 -Subject: Change the default optimization from -O3 to -O2 in - mysql_release.cmake BUILD_CONFIG profile - ---- - cmake/build_configurations/mysql_release.cmake | 12 ++++++------ - .../PerconaFT/cmake_modules/TokuSetupCompiler.cmake | 16 ++++++++-------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake -index c07de46..69a70ff 100644 ---- a/cmake/build_configurations/mysql_release.cmake -+++ b/cmake/build_configurations/mysql_release.cmake -@@ -155,12 +155,12 @@ IF(UNIX) - IF(CMAKE_COMPILER_IS_GNUCC) - SET(COMMON_C_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized") - SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}") -- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") -+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(COMMON_CXX_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized") - SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}") -- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") -+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 ${COMMON_CXX_FLAGS}") - ENDIF() - - # IBM Z flags -@@ -209,8 +209,8 @@ IF(UNIX) - ENDIF() - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") -- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_C_FLAGS}") -- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_CXX_FLAGS}") -+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -unroll2 -ip ${COMMON_C_FLAGS}") -+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -unroll2 -ip ${COMMON_CXX_FLAGS}") - SET(WITH_SSL no) - ENDIF() - ENDIF() -@@ -219,12 +219,12 @@ IF(UNIX) - IF(CMAKE_C_COMPILER_ID MATCHES "Clang") - SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") -- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") -+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") -- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") -+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 ${COMMON_CXX_FLAGS}") - ENDIF() - - # Solaris flags -diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -index 0cd9a9c..3b4b43c 100644 ---- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -+++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -115,10 +115,10 @@ set(CMAKE_CXX_FLAGS_DRD "-g3 -O1 ${CMAKE_CXX_FLAGS_DRD}") - ## need to set flags for RelWithDebInfo as well because we want the MySQL/MariaDB builds to use them - if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) - # have tried -flto and -O4, both make our statically linked executables break apple's linker -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O2 -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O2 -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g -O2 ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g -O2 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - else () - if (APPLE) - set(FLTO_OPTS "-fwhole-program") -@@ -126,10 +126,10 @@ else () - set(FLTO_OPTS "-fuse-linker-plugin") - endif() - # we overwrite this because the default passes -DNDEBUG and we don't want that -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") -- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O2 -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O2 -UNDEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-g -O2 -flto ${FLTO_OPTS} ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-g -O2 -flto ${FLTO_OPTS} ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") - set(CMAKE_EXE_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS "-g ${FLTO_OPTS} ${CMAKE_SHARED_LINKER_FLAGS}") - endif () diff --git a/debian/patches/fix-FTBFS-on-GNU-Hurd.patch b/debian/patches/fix-FTBFS-on-GNU-Hurd.patch deleted file mode 100644 index f318aaaae6d7c3cf92384eb54cd4cbcbdcb81d52..0000000000000000000000000000000000000000 --- a/debian/patches/fix-FTBFS-on-GNU-Hurd.patch +++ /dev/null @@ -1,248 +0,0 @@ -From: Debian MySQL Maintainers -Date: Thu, 10 Aug 2017 20:40:29 +0200 -Subject: fix-FTBFS-on-GNU-Hurd - ---- - cmake/dtrace.cmake | 4 +++ - cmake/package_name.cmake | 3 ++ - extra/mariabackup/backup_copy.cc | 29 +++++++++++++----- - mysys/mysys_priv.h | 10 +++++-- - sql/wsrep_binlog.cc | 42 ++++++++++++++++++++------- - storage/mroonga/vendor/groonga/config.h.cmake | 1 + - 6 files changed, 68 insertions(+), 21 deletions(-) - -diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake -index 3edcdc4..c090d65 100644 ---- a/cmake/dtrace.cmake -+++ b/cmake/dtrace.cmake -@@ -45,6 +45,10 @@ MACRO(CHECK_DTRACE) - AND NOT BUGGY_LINUX_DTRACE) - SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace") - ENDIF() -+ # On GNU/Hurd, dtrace is not supported -+ IF(DTRACE AND CMAKE_SYSTEM_NAME MATCHES "GNU") -+ SET(ENABLE_DTRACE OFF CACHE BOOL "Disable dtrace") -+ ENDIF() - SET(HAVE_DTRACE ${ENABLE_DTRACE}) - IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - IF(CMAKE_SIZEOF_VOID_P EQUAL 4) -diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake -index 7681f78..2a9b1e1 100644 ---- a/cmake/package_name.cmake -+++ b/cmake/package_name.cmake -@@ -81,6 +81,9 @@ IF(NOT VERSION) - SET(DEFAULT_MACHINE "i386") - ENDIF() - ENDIF() -+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "GNU") -+ SET(DEFAULT_PLATFORM "GNU") -+ SET(DEFAULT_MACHINE "i386") - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin") - IF(CMAKE_OSX_DEPLOYMENT_TARGET) - SET(DEFAULT_PLATFORM "osx${CMAKE_OSX_DEPLOYMENT_TARGET}") -diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc -index c019209..632faad 100644 ---- a/extra/mariabackup/backup_copy.cc -+++ b/extra/mariabackup/backup_copy.cc -@@ -623,11 +623,13 @@ static - int - mkdirp(const char *pathname, int Flags, myf MyFlags) - { -- char parent[PATH_MAX], *p; -+ char *parent, *p; -+ int len = strlen(pathname) + 1; - - /* make a parent directory path */ -- strncpy(parent, pathname, sizeof(parent)); -- parent[sizeof(parent) - 1] = 0; -+ parent = (char *)malloc(len); -+ strncpy(parent, pathname, len); -+ parent[len] = 0; - - for (p = parent + strlen(parent); - !is_path_separator(*p) && p != parent; p--); -@@ -636,19 +638,23 @@ mkdirp(const char *pathname, int Flags, myf MyFlags) - - /* try to make parent directory */ - if (p != parent && mkdirp(parent, Flags, MyFlags) != 0) { -+ free(parent); - return(-1); - } - - /* make this one if parent has been made */ - if (my_mkdir(pathname, Flags, MyFlags) == 0) { -+ free(parent); - return(0); - } - - /* if it already exists that is fine */ - if (errno == EEXIST) { -+ free(parent); - return(0); - } - -+ free(parent); - return(-1); - } - -@@ -658,17 +664,24 @@ bool - equal_paths(const char *first, const char *second) - { - #ifdef HAVE_REALPATH -- char real_first[PATH_MAX]; -- char real_second[PATH_MAX]; -+ char *real_first, *real_second; -+ int result; - -- if (realpath(first, real_first) == NULL) { -+ real_first = realpath(first, 0); -+ if (real_first == NULL) { - return false; - } -- if (realpath(second, real_second) == NULL) { -+ -+ real_second = realpath(second, 0); -+ if (real_second == NULL) { -+ free(real_second); - return false; - } - -- return (strcmp(real_first, real_second) == 0); -+ result = strcmp(real_first, real_second); -+ free(real_first); -+ free(real_second); -+ return result == 0; - #else - return strcmp(first, second) == 0; - #endif -diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h -index 892e091..9bf44e0 100644 ---- a/mysys/mysys_priv.h -+++ b/mysys/mysys_priv.h -@@ -16,6 +16,10 @@ - #ifndef MYSYS_PRIV_INCLUDED - #define MYSYS_PRIV_INCLUDED - -+#ifndef _GNU_SOURCE -+#define _GNU_SOURCE -+#endif -+ - #include - #include - #include -@@ -111,7 +115,7 @@ void my_error_unregister_all(void); - #ifndef O_PATH /* not Linux */ - #if defined(O_SEARCH) /* Illumos */ - #define O_PATH O_SEARCH --#elif defined(O_EXEC) /* FreeBSD */ -+#elif defined(O_EXEC) && defined(__FreeBSD_kernel__) /* FreeBSD */ - #define O_PATH O_EXEC - #endif - #endif -@@ -128,8 +132,8 @@ const char *my_open_parent_dir_nosymlinks(const char *pathname, int *pdfd); - return res; - #elif defined(HAVE_REALPATH) && defined(PATH_MAX) - #define NOSYMLINK_FUNCTION_BODY(AT,NOAT) \ -- char buf[PATH_MAX+1]; \ -- if (realpath(pathname, buf) == NULL) return -1; \ -+ char *buf = realpath(NULL, 0); \ -+ if (buf == NULL) return -1; \ - if (strcmp(pathname, buf)) { errno= ENOTDIR; return -1; } \ - return NOAT; - #elif defined(HAVE_REALPATH) -diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc -index 998f4e7..784b235 100644 ---- a/sql/wsrep_binlog.cc -+++ b/sql/wsrep_binlog.cc -@@ -318,13 +318,23 @@ int wsrep_write_cache(wsrep_t* const wsrep, - - void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len) - { -- char filename[PATH_MAX]= {0}; -- int len= snprintf(filename, PATH_MAX, "%s/GRA_%ld_%lld.log", -+ int len = snprintf(NULL, 0, "%s/GRA_%ld_%lld.log", - wsrep_data_home_dir, thd->thread_id, - (long long)wsrep_thd_trx_seqno(thd)); -- if (len >= PATH_MAX) -+ if (len < 0) - { -- WSREP_ERROR("RBR dump path too long: %d, skipping dump.", len); -+ WSREP_ERROR("snprintf error: %d, skipping dump.", len); -+ DBUG_VOID_RETURN; -+ } -+ -+ char *filename= (char *)malloc(len++); -+ int len1= snprintf(filename, len, "%s/GRA_%ld_%lld.log", -+ wsrep_data_home_dir, thd->thread_id, -+ (long long)wsrep_thd_trx_seqno(thd)); -+ if (len >= len1) -+ { -+ WSREP_ERROR("RBR dump path truncated: %d, skipping dump.", len); -+ free(filename); - return; - } - -@@ -343,6 +353,7 @@ void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len) - WSREP_ERROR("Failed to open file '%s': %d (%s)", - filename, errno, strerror(errno)); - } -+ free(filename); - } - - /* -@@ -448,19 +459,29 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf, - { - DBUG_ENTER("wsrep_dump_rbr_buf_with_header"); - -- char filename[PATH_MAX]= {0}; - File file; - IO_CACHE cache; - Log_event_writer writer(&cache); - Format_description_log_event *ev=NULL; - -- int len= my_snprintf(filename, PATH_MAX, "%s/GRA_%ld_%lld_v2.log", -- wsrep_data_home_dir, thd->thread_id, -- (long long) wsrep_thd_trx_seqno(thd)); -+ int len = snprintf(NULL, 0, "%s/GRA_%ld_%lld_v2.log", -+ wsrep_data_home_dir, thd->thread_id, -+ (long long) wsrep_thd_trx_seqno(thd)); - -- if (len >= PATH_MAX) -+ if (len < 0) - { -- WSREP_ERROR("RBR dump path too long: %d, skipping dump.", len); -+ WSREP_ERROR("snprintf error: %d, skipping dump.", len); -+ DBUG_VOID_RETURN; -+ } -+ -+ char *filename = (char *)malloc(len++); -+ int len1 = my_snprintf(filename, len, "%s/GRA_%ld_%lld_v2.log", -+ wsrep_data_home_dir, thd->thread_id, -+ (long long) wsrep_thd_trx_seqno(thd)); -+ -+ if (len >= len1) -+ { -+ WSREP_ERROR("RBR dump path truncated: %d, skipping dump.", len); - DBUG_VOID_RETURN; - } - -@@ -498,6 +519,7 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf, - } - - cleanup2: -+ free(filename); - end_io_cache(&cache); - - cleanup1: -diff --git a/storage/mroonga/vendor/groonga/config.h.cmake b/storage/mroonga/vendor/groonga/config.h.cmake -index bfd0cbd..ec67c5e 100644 ---- a/storage/mroonga/vendor/groonga/config.h.cmake -+++ b/storage/mroonga/vendor/groonga/config.h.cmake -@@ -107,6 +107,7 @@ - #cmakedefine HAVE_SIGNAL_H - #cmakedefine HAVE_SYS_MMAN_H - #cmakedefine HAVE_SYS_PARAM_H -+#cmakedefine HAVE_SYS_POLL_H - #cmakedefine HAVE_SYS_RESOURCE_H - #cmakedefine HAVE_SYS_SELECT_H - #cmakedefine HAVE_SYS_SOCKET_H