Attachment 152428 Details for Bug 197232 – TokuDB patch

[patch] TokuDB patch

mariadb100-server-tokudb.patch (text/plain), 3.96 KB, created by Jim Riggs on 2015-02-01 04:22:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Riggs

Created: 2015-02-01 04:22:06 UTC

Size: 3.96 KB

patch

obsolete

>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 0000000..07c3b31
>--- /dev/null
>+++ b/databases/mariadb100-server/files/patch-storage_tokudb_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- storage/tokudb/CMakeLists.txt.orig	2015-01-31 21:48:15.716944365 -0600
>++++ storage/tokudb/CMakeLists.txt	2015-01-31 21:47:23.133848888 -0600
>+@@ -1,5 +1,7 @@
>+ # ft-index only supports x86-64 and cmake-2.8.9+
>+-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
>++IF((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
>++    (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND
>++     CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")) AND
>+     NOT CMAKE_VERSION VERSION_LESS "2.8.9")
>+ CHECK_CXX_SOURCE_COMPILES(
>+ "
>diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
>index 8325f3e..b7145ec 100644
>--- a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
>+++ b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
>@@ -15,3 +15,12 @@
>  endif ()
>  
>  if(HAVE_CLOCK_REALTIME)
>+@@ -116,7 +110,7 @@ include(CheckCSourceCompiles)
>+ if (HAVE_PTHREAD_YIELD)
>+   include(CheckPrototypeDefinition)
>+ 
>+-  check_prototype_definition(pthread_yield "void pthread_yield(void)" 0 "pthread.h" PTHREAD_YIELD_RETURNS_VOID)
>++  check_prototype_definition(pthread_yield "void pthread_yield(void)" "(void)0" "pthread.h" PTHREAD_YIELD_RETURNS_VOID)
>+   check_c_source_compiles("#include <pthread.h>
>+ int main(void) {
>+   int r = pthread_yield();
>diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_ft_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_ft_CMakeLists.txt
>new file mode 100644
>index 0000000..44b27be
>--- /dev/null
>+++ b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_ft_CMakeLists.txt
>@@ -0,0 +1,13 @@
>+--- storage/tokudb/ft-index/ft/CMakeLists.txt.orig	2015-01-26 13:47:54.759379951 -0600
>++++ storage/tokudb/ft-index/ft/CMakeLists.txt	2015-01-26 13:47:57.259394902 -0600
>+@@ -9,7 +9,9 @@
>+ 
>+ add_executable(logformat logger/logformat.cc)
>+ target_link_libraries(logformat ${LIBTOKUPORTABILITY}_static)
>+-add_space_separated_property(TARGET logformat LINK_FLAGS --coverage)
>++if (USE_GCOV)
>++  add_space_separated_property(TARGET logformat LINK_FLAGS --coverage)
>++endif (USE_GCOV)
>+ 
>+ 
>+ add_custom_command(
>diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_ft_serialize_block__allocator.h b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_ft_serialize_block__allocator.h
>new file mode 100644
>index 0000000..af12b4c
>--- /dev/null
>+++ b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_ft_serialize_block__allocator.h
>@@ -0,0 +1,10 @@
>+--- storage/tokudb/ft-index/ft/serialize/block_allocator.h.orig	2014-11-21 21:02:55 UTC
>++++ storage/tokudb/ft-index/ft/serialize/block_allocator.h
>+@@ -96,6 +96,7 @@ PATENT RIGHTS GRANT:
>+ 
>+ #include "portability/toku_pthread.h"
>+ #include "portability/toku_stdint.h"
>++#include "portability/toku_stdlib.h"
>+ 
>+ // Block allocator.
>+ //
>diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist
>index d00a737..86568a1 100644
>--- a/databases/mariadb100-server/pkg-plist
>+++ b/databases/mariadb100-server/pkg-plist
>@@ -34,6 +34,7 @@ bin/perror
> bin/replace
> bin/resolve_stack_dump
> bin/resolveip
>+bin/tokuftdump
> include/mysql/private/embedded_priv.h
> lib/mysql/libmysqld.a
> lib/mysql/libmysqld.so
>@@ -59,6 +60,7 @@ lib/mysql/plugin/ha_sequence.so
> lib/mysql/plugin/ha_sphinx.so
> lib/mysql/plugin/ha_spider.so
> lib/mysql/plugin/ha_test_sql_discovery.so
>+lib/mysql/plugin/ha_tokudb.so
> lib/mysql/plugin/handlersocket.so
> lib/mysql/plugin/libdaemon_example.so
> lib/mysql/plugin/locales.so

Actions: View | Diff

Attachments on bug 197232: 152428