Page MenuHomeFreeBSD
Files F133109244

D5602.id14225.diff
No OneTemporary
Actions

D5602.id14225.diff
View Options

Index: databases/percona56-client/Makefile
===================================================================
--- databases/percona56-client/Makefile
+++ databases/percona56-client/Makefile
@@ -8,6 +8,8 @@
MASTERDIR= ${.CURDIR}/../percona56-server
+OPTIONS_EXCLUDE=TOKUDB
+
PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
Index: databases/percona56-client/files/patch-extra_CMakeLists.txt
===================================================================
--- databases/percona56-client/files/patch-extra_CMakeLists.txt
+++ databases/percona56-client/files/patch-extra_CMakeLists.txt
@@ -1,14 +1,15 @@
---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100
-+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100
-@@ -60,6 +60,7 @@
+--- extra/CMakeLists.txt.orig 2016-03-03 15:27:37.000000000 +0200
++++ extra/CMakeLists.txt 2016-03-10 21:04:51.367091216 +0200
+@@ -59,7 +59,7 @@
+ ADD_DEPENDENCIES(GenError copy_openssl_extra)
ENDIF()
-
+-
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -96,11 +97,14 @@
+@@ -98,10 +98,13 @@
MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
ENDIF()
@@ -16,9 +17,8 @@
IF(UNIX)
+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
+ MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
Index: databases/percona56-server/Makefile
===================================================================
--- databases/percona56-server/Makefile
+++ databases/percona56-server/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= percona
-DISTVERSION= 5.6.27-75.0
+DISTVERSION= 5.6.29-76.2
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
@@ -15,12 +15,20 @@
SLAVEDIRS= databases/percona56-client
USES= bison cmake perl5 shebangfix
-OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED
+OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED
OPTIONS_SUB= yes
+
FASTMTX_DESC= Replace mutexes with spinlocks
+FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
INNODBMEMCACHED_DESC= InnoDB Memcached plugin
INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1
+OPENSSL_CMAKE_ON= -DWITH_SSL=bundled
+TOKUDB_DESC= TokuDB Engine (experimental)
+TOKUDB_CMAKE_ON=-DUSE_CTAGS=0
+TOKUDB_VARS= ONLY_FOR_ARCHS="amd64" \
+ ONLY_FOR_ARCHS_REASON="TokuDB engine does not compile on ${ARCH}"
+TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
DATADIR= ${PREFIX}/share/mysql
@@ -49,14 +57,6 @@
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENSSL}
-CMAKE_ARGS+= -DWITH_SSL=bundled
-.endif
-.if ${PORT_OPTIONS:MFASTMTX}
-CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
-.endif
# MySQL-Server part
.if !defined(CLIENT_ONLY)
Index: databases/percona56-server/distinfo
===================================================================
--- databases/percona56-server/distinfo
+++ databases/percona56-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (percona-server-5.6.27-75.0.tar.gz) = 7dc4a4efadaee25e11fd78838f4ad2c0d7921ac9cc3b95068626f918c0add8d7
-SIZE (percona-server-5.6.27-75.0.tar.gz) = 54907367
+SHA256 (percona-server-5.6.29-76.2.tar.gz) = 23217feafc92222f313aeeb6e1806d110c35e50cf0b5f74510a9f8babe22e4b9
+SIZE (percona-server-5.6.29-76.2.tar.gz) = 55032788
Index: databases/percona56-server/files/extrapatch-tokudb
===================================================================
--- /dev/null
+++ databases/percona56-server/files/extrapatch-tokudb
@@ -0,0 +1,62 @@
+--- 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 {
Index: databases/percona56-server/pkg-plist
===================================================================
--- databases/percona56-server/pkg-plist
+++ databases/percona56-server/pkg-plist
@@ -23,12 +23,16 @@
bin/replace
bin/resolve_stack_dump
bin/resolveip
+%%TOKUDB%%bin/tokuft_logprint
+%%TOKUDB%%bin/tokuftdump
+%%TOKUDB%%lib/mysql/libHotBackup.so
lib/mysql/libmysqld.a
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/audit_log.so
lib/mysql/plugin/auth.so
lib/mysql/plugin/auth_test_plugin.so
lib/mysql/plugin/daemon_example.ini
+%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
lib/mysql/plugin/handlersocket.so
%%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so
lib/mysql/plugin/libdaemon_example.so
@@ -45,6 +49,7 @@
lib/mysql/plugin/scalability_metrics.so
lib/mysql/plugin/semisync_master.so
lib/mysql/plugin/semisync_slave.so
+%%TOKUDB%%lib/mysql/plugin/tokudb_backup.so
lib/mysql/plugin/validate_password.so
libexec/mysqld
man/man1/my_print_defaults.1.gz
@@ -74,6 +79,7 @@
man/man1/resolve_stack_dump.1.gz
man/man1/resolveip.1.gz
man/man8/mysqld.8.gz
+%%TOKUDB%%share/doc/mysql/README_tokudb_backup
%%DATADIR%%/binary-configure
%%DATADIR%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 24, 1:33 AM (3 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24111927
Default Alt Text
D5602.id14225.diff (8 KB)

Event Timeline