Changeset View
Changeset View
Standalone View
Standalone View
databases/percona56-server/files/extra-tokudb.patch
- This file was added.
--- storage/tokudb/CMakeLists.txt.orig 2016-03-03 15:32:33.000000000 +0200 | |||||
+++ storage/tokudb/CMakeLists.txt 2016-03-08 10:13:58.000000000 +0200 | |||||
@@ -1,6 +1,6 @@ | |||||
SET(TOKUDB_VERSION 5.6.29-76.2) | |||||
# PerconaFT only supports x86-64 and cmake-2.8.9+ | |||||
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND | |||||
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" AND | |||||
NOT CMAKE_VERSION VERSION_LESS "2.8.9") | |||||
CHECK_CXX_SOURCE_COMPILES( | |||||
" | |||||
@@ -118,5 +118,5 @@ | |||||
tokudb_thread.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} ") | |||||
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig 2016-03-03 15:31:53.000000000 +0200 | |||||
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt 2016-03-10 11:13:23.772664272 +0200 | |||||
@@ -69,7 +69,7 @@ | |||||
endif () | |||||
endfunction(add_space_separated_property) | |||||
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG") | |||||
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG") | |||||
if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) | |||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") | |||||
endif () | |||||
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig 2016-03-03 15:31:53.000000000 +0200 | |||||
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc 2016-03-08 10:40:07.000000000 +0200 | |||||
@@ -85,7 +85,7 @@ | |||||
if (oflag & O_CREAT) { | |||||
va_list ap; | |||||
va_start(ap, oflag); | |||||
- mode_t mode = va_arg(ap, mode_t); | |||||
+ mode_t mode = va_arg(ap, int); | |||||
va_end(ap); | |||||
the_manager.lock_file_op(); | |||||
fd = call_real_open(file, oflag, mode); | |||||
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig 2016-03-03 15:31:53.000000000 +0200 | |||||
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc 2016-03-08 10:37:19.000000000 +0200 | |||||
@@ -36,7 +36,7 @@ | |||||
#include <string.h> | |||||
#include <pthread.h> | |||||
-#include <malloc.h> | |||||
+#include <stdlib.h> | |||||
#include <stdio.h> | |||||
#include "source_file.h" | |||||
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig 2016-03-03 15:31:53.000000000 +0200 | |||||
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc 2016-03-08 10:38:58.000000000 +0200 | |||||
@@ -104,7 +104,7 @@ | |||||
if (oflag & O_CREAT) { | |||||
va_list op; | |||||
va_start(op, oflag); | |||||
- mode_t mode = va_arg(op, mode_t); | |||||
+ mode_t mode = va_arg(op, int); | |||||
va_end(op); | |||||
return real_open(file, oflag, mode); | |||||
} else { |