diff options
Diffstat (limited to 'databases/mariadb100-server/files')
6 files changed, 76 insertions, 41 deletions
diff --git a/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake deleted file mode 100644 index 8894a2d3dbfa..000000000000 --- a/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake +++ /dev/null @@ -1,28 +0,0 @@ -Upstreamed https://github.com/MariaDB/server/pull/139 - ---- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC -+++ cmake/jemalloc.cmake -@@ -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) -+ 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) diff --git a/databases/mariadb100-server/files/patch-storage_connect_json.cpp b/databases/mariadb100-server/files/patch-storage_connect_json.cpp deleted file mode 100644 index c3cd4ea49b73..000000000000 --- a/databases/mariadb100-server/files/patch-storage_connect_json.cpp +++ /dev/null @@ -1,13 +0,0 @@ -# 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_connect_tabmysql.cpp b/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp new file mode 100644 index 000000000000..a42aa721a02d --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_connect_tabmysql.cpp @@ -0,0 +1,13 @@ +See https://mariadb.atlassian.net/browse/MDEV-9603 + +--- storage/connect/tabmysql.cpp.orig 2016-04-28 20:27:49 UTC ++++ storage/connect/tabmysql.cpp +@@ -334,7 +334,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCST + Delayed = !!GetIntCatInfo("Delayed", 0); + } else { + // MYSQL access from a PROXY table +- Database = GetStringCatInfo(g, "Database", Schema ? Schema : PlugDup(g, "*")); ++ Database = GetStringCatInfo(g, "Database", Schema ? Schema : PlugDup(g, (PSZ)"*")); + Isview = GetBoolCatInfo("View", false); + + // We must get other connection parms from the calling table diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt new file mode 100644 index 000000000000..cd1f2a84bea8 --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt @@ -0,0 +1,13 @@ +--- storage/tokudb/CMakeLists.txt.orig 2016-02-17 20:59:56 UTC ++++ storage/tokudb/CMakeLists.txt +@@ -131,8 +131,8 @@ SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb") + SET(TOKUDB_SOURCES ha_tokudb.cc) + MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY + LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++) +-SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") +-SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") ++SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE}") ++SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO}") + + SET(CPACK_RPM_server_PACKAGE_OBSOLETES + "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE) diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake new file mode 100644 index 000000000000..bce1fd09db6f --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake @@ -0,0 +1,37 @@ +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2016-02-17 20:59:56 UTC ++++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake +@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) + endif () + endif () + ++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ include_directories("/usr/include") ++ ++ add_library(lzma SHARED IMPORTED) ++ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION ++ "/usr/lib/liblzma.so") ++ELSE() + ## add lzma with an external project + set(xz_configure_opts --with-pic --enable-static) + if (APPLE) +@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) + set_target_properties(lzma PROPERTIES IMPORTED_LOCATION + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") + add_dependencies(lzma build_lzma) ++ENDIF() + ++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ include_directories("/usr/local/include") + ++ add_library(snappy SHARED IMPORTED) ++ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION ++ "/usr/local/lib/libsnappy.so") ++ELSE() + ## add snappy with an external project + set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") + if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") +@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) + set_target_properties(snappy PROPERTIES IMPORTED_LOCATION + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") + add_dependencies(snappy build_snappy) ++ENDIF() diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt new file mode 100644 index 000000000000..640ccd2263f9 --- /dev/null +++ b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt @@ -0,0 +1,13 @@ +--- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2016-02-17 21:59:56.000000000 +0100 ++++ storage/tokudb/PerconaFT/ft/CMakeLists.txt 2016-02-21 20:51:12.317052693 +0100 +@@ -84,8 +84,8 @@ set_target_properties(ft_static PROPERTI + maybe_add_gcov_to_libraries(ft ft_static) + + ## depend on other generated targets +-add_dependencies(ft install_tdb_h generate_log_code build_lzma build_snappy) +-add_dependencies(ft_static install_tdb_h generate_log_code build_lzma build_snappy) ++add_dependencies(ft install_tdb_h generate_log_code) ++add_dependencies(ft_static install_tdb_h generate_log_code) + + ## link with lzma (which should be static) and link dependers with zlib + target_link_libraries(ft LINK_PRIVATE util_static lzma snappy ${LIBTOKUPORTABILITY}) |