diff options
Diffstat (limited to 'databases/mariadb100-server/files')
| -rw-r--r-- | databases/mariadb100-server/files/patch-cmake_jemalloc.cmake | 30 | ||||
| -rw-r--r-- | databases/mariadb100-server/files/patch-storage_connect_json.cpp | 13 | ||||
| -rw-r--r-- | databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake (renamed from databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake) | 4 | ||||
| -rw-r--r-- | databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (renamed from databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc) | 4 |
4 files changed, 37 insertions, 14 deletions
diff --git a/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake index ca8a8626617e..8894a2d3dbfa 100644 --- a/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake +++ b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake @@ -1,18 +1,28 @@ ---- cmake/jemalloc.cmake.orig 2015-06-17 14:54:11 UTC +Upstreamed https://github.com/MariaDB/server/pull/139 + +--- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC +++ cmake/jemalloc.cmake -@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC) +@@ -20,11 +20,21 @@ MACRO (CHECK_JEMALLOC) + SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) + SET(what bundled) + ELSE() +- SET(libname jemalloc) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(libname c) ++ ELSE() ++ SET(libname jemalloc) ++ ENDIF() SET(what system) ENDIF() - CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(HAVE_JEMALLOC ON) ++ ELSE() ++ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) ++ ENDIF() SET(CMAKE_REQUIRED_LIBRARIES) IF (HAVE_JEMALLOC) -- SET(LIBJEMALLOC ${libname}) -- SET(MALLOC_LIBRARY "${what} jemalloc") -+ SET(LIBJEMALLOC c) -+ SET(MALLOC_LIBRARY "system jemalloc") - ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") - MESSAGE(FATAL_ERROR "${libname} is not found") - ENDIF() diff --git a/databases/mariadb100-server/files/patch-storage_connect_json.cpp b/databases/mariadb100-server/files/patch-storage_connect_json.cpp new file mode 100644 index 000000000000..c3cd4ea49b73 --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_connect_json.cpp @@ -0,0 +1,13 @@ +# Add patch for https://mariadb.atlassian.net/browse/MDEV-9322 + +--- storage/connect/json.cpp.orig 2015-12-16 16:05:45 UTC ++++ storage/connect/json.cpp +@@ -594,7 +594,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char + if (fs) { + fputs(EL, fs); + fclose(fs); +- str = (err) ? NULL : "Ok"; ++ str = (err) ? NULL : (char*)"Ok"; + } else if (!err) { + str = ((JOUTSTR*)jp)->Strp; + jp->WriteChr('\0'); diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake index d894a2a81c3e..7fe07d8427d2 100644 --- a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake +++ b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake @@ -1,5 +1,5 @@ ---- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake +--- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC ++++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake @@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) endif () check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc index 216620d315cb..61187db8b0c8 100644 --- a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc +++ b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc @@ -1,5 +1,5 @@ ---- storage/tokudb/ft-index/portability/memory.cc.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/ft-index/portability/memory.cc +--- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-06-17 14:54:13 UTC ++++ storage/tokudb/PerconaFT/portability/memory.cc @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: #include <string.h> #include <stdio.h> |