Merge lp:~percona-core/percona-server/percona-server-tokudb-rc into lp:percona-server/5.6

[Tomislav Plavcic]

Release branch for Release 5.6.17-66.0 (TokuDB RC)

[Laurynas Biveinis (laurynas-biveinis)]

sql/handler.h change is spurious and will be reverted in trunk after this is merged.

mysqld_safe.sh patch means that jemalloc will always be loaded if found in the checked paths, regardless of TokuDB presence, with no option to avoid it. Was this agreed on somewhere?

review: Needs Information

[Tomislav Plavcic (tplavcic)]

Hi Laurynas,
regarding the jemalloc loading I have sent you mail that I sent to Vadim and his response - as I had same concerns. But basically he says it's ok, although feel free to comment it more if you think different.

[Tomislav Plavcic (tplavcic)]

The problem with change in sql/handler.h is that without it it won't compile (see link below):
http://jenkins.percona.com/job/percona-server-5.6-redhat-binary-test/4/label_exp=centos6-64/consoleFull
So we need to see what to do about it - will also write comment on the tokudb mailing list - there was some thread about this.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'VERSION'
--- VERSION	2014-06-11 13:45:54 +0000
+++ VERSION	2014-06-16 07:08:31 +0000
@@ -1,4 +1,9 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
+<<<<<<< TREE
 MYSQL_VERSION_PATCH=19
 MYSQL_VERSION_EXTRA=-66.1
+=======
+MYSQL_VERSION_PATCH=17
+MYSQL_VERSION_EXTRA=-66.0
+>>>>>>> MERGE-SOURCE

=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2014-06-11 13:45:54 +0000
+++ build-ps/build-binary.sh	2014-06-16 07:08:31 +0000
@@ -24,6 +24,7 @@
 CRYPTO_LIBRARY=''
 TAG=''
 #
+CMAKE_BUILD_TYPE=''
 COMMON_FLAGS=''
 #
 # Some programs that may be overriden
@@ -164,6 +165,24 @@
 export CC=${CC:-gcc}
 export CXX=${CXX:-g++}
 
+# TokuDB cmake flags
+if test -d "$SOURCEDIR/storage/tokudb"
+then
+    CMAKE_OPTS="${CMAKE_OPTS:-} -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF"
+    
+    if test "x$CMAKE_BUILD_TYPE" != "xDebug"
+    then
+        CMAKE_OPTS="${CMAKE_OPTS:-} -DTOKU_DEBUG_PARANOID=OFF"
+    else
+        CMAKE_OPTS="${CMAKE_OPTS:-} -DTOKU_DEBUG_PARANOID=ON"
+    fi
+
+    if [[ $CMAKE_OPTS == *WITH_VALGRIND=ON* ]]
+    then
+        CMAKE_OPTS="${CMAKE_OPTS:-} -DUSE_VALGRIND=ON"
+    fi
+fi
+
 #
 if [ -n "$(which rpm)" ]; then
   export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
@@ -235,9 +254,17 @@
 (
     cd "$INSTALLDIR/usr/local/"
 
-    $TAR czf "$WORKDIR_ABS/$PRODUCT_FULL.tar.gz" \
-        --owner=0 --group=0 "$PRODUCT_FULL/"
-    
+    find $PRODUCT_FULL ! -type d  ! -iname "*tdb*.h" -a ! -iname "*toku*" | sort > $WORKDIR_ABS/tokudb_server.list
+    $TAR --owner=0 --group=0 -czf "$WORKDIR_ABS/$PRODUCT_FULL.tar.gz" -T $WORKDIR_ABS/tokudb_server.list
+    rm -f $WORKDIR_ABS/tokudb_server.list
+
+    if test -e "$PRODUCT_FULL/lib/mysql/plugin/ha_tokudb.so"
+    then
+        TARGETTOKU=$(echo $PRODUCT_FULL | sed 's/.Linux/.TokuDB.Linux/')
+        find $PRODUCT_FULL ! -type d  -iname "*toku*" -o -iname "*tdb*.h" > $WORKDIR_ABS/tokudb_plugin.list
+        $TAR --owner=0 --group=0 -czf "$WORKDIR_ABS/$TARGETTOKU.tar.gz" -T $WORKDIR_ABS/tokudb_plugin.list
+        rm -f $WORKDIR_ABS/tokudb_plugin.list
+    fi
 )
 
 # Clean up

=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2014-06-11 13:45:54 +0000
+++ build-ps/debian/changelog	2014-06-16 07:08:31 +0000
@@ -1,3 +1,9 @@
+percona-server-5.6 (5.6.17-rel66.0) unstable; urgency=low
+
+  * Added packaging changes regarding TokuDB
+
+ -- Tomislav Plavcic <[e-mail]>  Mon, 26 May 2014 08:28:27 +0200
+
 percona-server-5.6 (5.6.17-rel65.0) unstable; urgency=low
 
   * Fixed provides/breaks/replaces for client/server debian packages

=== added file 'build-ps/debian/control.tokudb'
--- build-ps/debian/control.tokudb	1970-01-01 00:00:00 +0000
+++ build-ps/debian/control.tokudb	2014-06-16 07:08:31 +0000
@@ -0,0 +1,266 @@
+Source: percona-server-5.6
+Section: database
+Priority: extra
+Maintainer: Percona Server Development Team <[e-mail]>
+Uploaders: George Lorch <[e-mail]>,
+           Alexey Bychko <[e-mail]>
+Build-Depends: libtool (>= 1.4.2-7),
+               procps,
+               debhelper (>= 7.0.50~),
+               file (>= 3.28),
+               libncurses5-dev (>= 5.0-6),
+               perl (>= 5.6.0),
+               libwrap0-dev (>= 7.6-8.3),
+               zlib1g-dev (>= 1:1.1.3-5),
+               libreadline-dev,
+               psmisc,
+               po-debconf,
+               chrpath,
+               ghostscript,
+               gawk,
+               bison,
+               lsb-release,
+               cmake,
+               gcc (>= 4.4),
+               g++ (>= 4.4),
+               libaio-dev[linux-any],
+               libpam-dev,
+               libssl-dev
+Standards-Version: 3.9.4
+Homepage: http://www.percona.com/software/percona-server/
+Vcs-Bzr: lp:percona-server/5.6
+
+Package: percona-server-tokudb-5.6
+Section: database
+Architecture: any
+Depends: percona-server-server-5.6 (= ${binary:Version}), libjemalloc1 (>= 3.3.0), ${misc:Depends}
+Description: TokuDB engine plugin for Percona Server 
+ .
+ TokuDB is a storage engine for MySQL and MariaDB that is specifically 
+ designed for high performance on write-intensive workloads. It achieves 
+ this via Fractal Tree indexing. TokuDB is a scalable, ACID and MVCC compliant 
+ storage engine that provides indexing-based query improvements, offers online 
+ schema modifications, and reduces slave lag for both hard disk drives and flash memory.
+ .
+ This package includes the TokuDB plugin library.
+
+Package: libperconaserverclient18.1
+Section: libs
+Architecture: any
+Depends: percona-server-common-5.6, ${misc:Depends}, ${shlibs:Depends}
+Replaces: libpercona-server-client16, libperconaserverclient18
+Description: Percona Server database client library
+ Percona Server is a fast, stable and true multi-user, 
+ multi-threaded SQL database server. SQL (Structured Query Language) 
+ is the most popular database query language in the world. The main 
+ goals of Percona Server are speed, robustness and ease of use.
+ .
+ This package includes the client library.
+
+Package: libperconaserverclient18.1-dev
+Architecture: any
+Section: libdevel
+Depends: libperconaserverclient18.1 (= ${binary:Version}),
+         zlib1g-dev, ${misc:Depends}
+Breaks: libperconaserverclient18-dev,
+        libperconaserverclient16-dev,
+        libperconaserverclient15-dev,
+        libperconaserverclient14-dev,
+        libperconaserverclient12-dev,
+        libperconaserverclient10-dev,
+        libmysqlclient-dev,
+        libmysqlclient18-dev,
+        libmariadbclient-dev
+Replaces: libperconaserverclient18-dev,
+          libperconaserverclient16-dev,
+          libperconaserverclient15-dev,
+          libperconaserverclient14-dev,
+          libperconaserverclient12-dev,
+          libperconaserverclient10-dev,
+          libpercona-xtradb-client-dev,
+          libmariadbclient-dev
+Provides: libmysqlclient-dev
+Description: Percona Server database development files
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL 
+ database server. SQL (Structured Query Language) is the most popular 
+ database query language in the world. The main goals of Percona Server are 
+ speed, robustness and ease of use.
+ .
+ This package includes development libraries and header files.
+
+Package: percona-server-common-5.6
+Section: database
+Architecture: any
+Depends: ${misc:Depends}
+Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed, 
+ robustness and ease of use.
+ .
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/my.cnf).
+
+Package: percona-server-client-5.6
+Architecture: any
+Depends: debianutils (>=1.6),
+         libdbi-perl,
+         percona-server-common-5.6 (>= ${source:Version}),
+         libperconaserverclient18.1 (>= ${source:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Provides: mysql-client,
+          virtual-mysql-client,
+          virtual-mysql-client-core
+Breaks: mysql-client-5.0,
+        mysql-client-core-5.1,
+        mysql-client-core-5.5,
+        mysql-client-5.1,
+        mysql-client-5.5,
+        mysql-client-5.6,
+        percona-xtradb-client-5.0,
+        percona-server-client-5.1,
+        percona-server-client-5.5,
+        mariadb-client,
+        mariadb-client-core-5.5,
+        mariadb-client-5.5,
+        virtual-mysql-client,
+        virtual-mysql-client-core
+Replaces: mysql-client-5.0,
+           mysql-client-core-5.1,
+           mysql-client-core-5.5,
+           mysql-client-5.1,
+           mysql-client-5.5,
+           mysql-client-5.6,
+           percona-xtradb-client-5.0,
+           percona-server-client-5.1,
+           percona-server-client-5.5,
+           mariadb-client,
+           mariadb-client-core-5.5,
+           mariadb-client-5.5,
+           virtual-mysql-client,
+           virtual-mysql-client-core
+Description: Percona Server database client binaries
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
+ .
+ This package includes the client binaries and the additional tools
+ innotop and mysqlreport.
+
+Package: percona-server-server-5.6
+Architecture: any
+Suggests: tinyca
+Pre-Depends: percona-server-common-5.6 (>= ${source:Version}),
+             adduser (>= 3.4.0),
+             debconf
+Depends: percona-server-client-5.6 (>= ${source:Version}),
+         libdbi-perl,
+         libdbd-mysql-perl,
+         perl (>= 5.6),
+         ${shlibs:Depends},
+         ${misc:Depends},
+         psmisc,
+         passwd,
+         lsb-base (>= 3.0-10)
+Provides: mysql-server,
+          virtual-mysql-server,
+          virtual-mysql-server-core
+Breaks: mysql-server-5.0,
+        mysql-server-5.1,
+        mysql-server-5.5,
+        mysql-server-5.6,
+        mysql-server-core-5.1,
+        percona-xtradb-server-5.0,
+        percona-server-server-5.1,
+        percona-server-server-5.5,
+        mariadb-server,
+        mariadb-server-core-5.5,
+        mariadb-server-5.5,
+        virtual-mysql-server,
+        virtual-mysql-server-core
+Replaces: mysql-server-5.0,
+          mysql-server-5.1,
+          mysql-server-5.5,
+          mysql-server-5.6,
+          mysql-server-core-5.1,
+          percona-xtradb-server-5.0,
+          percona-server-server-5.1,
+          percona-server-server-5.5,
+          mariadb-server,
+          mariadb-server-core-5.5,
+          mariadb-server-5.5,
+          virtual-mysql-server,
+          virtual-mysql-server-core
+Description: Percona Server database server binaries
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
+ .
+ This package includes the server binaries.
+
+Package: percona-server-server
+Section: database
+Architecture: any
+Depends: percona-server-server-5.6, ${misc:Depends}
+Description: Percona Server database server
+ (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ percona-server-server (currently percona-server-server-5.6), as determined 
+ by the Percona Server maintainers. Install this package if in doubt 
+ about which Percona Server version you need. That will install the version 
+ recommended by the package maintainers.
+ .
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
+
+Package: percona-server-client
+Section: database
+Architecture: any
+Depends: percona-server-client-5.6, ${misc:Depends}
+Description: Percona Server database client
+ (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ percona-server-client (currently percona-server-client-5.6), as determined 
+ by the Percona Server maintainers.  Install this package if in doubt 
+ about which Percona Server version you want, as this is the one we consider 
+ to be in the best shape.
+
+Package: percona-server-test-5.6
+Architecture: any
+Depends: percona-server-client-5.6 (>= ${source:Version}),
+         percona-server-server-5.6 (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Percona Server database test suite
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
+ .
+ This package includes the Percona Server test framework that provides 
+ a means for verifying that Percona Server and its client programs 
+ operate according to expectations
+
+Package: percona-server-source-5.6
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Percona Server 5.6 source
+ This package includes the source code to Percona Server as configured before
+ building.
+
+Package: percona-server-5.6-dbg
+Architecture: any
+Section: debug
+Depends: percona-server-server-5.6 (= ${binary:Version}), ${misc:Depends}
+Description: Debugging package for Percona Server
+ Percona Server is a fast, stable and true multi-user, multi-threaded SQL
+ database server. SQL (Structured Query Language) is the most popular database
+ query language in the world. The main goals of Percona Server are speed,
+ robustness and ease of use.
+ .
+ This package contains the debugging symbols for the Percona Server binaries.

=== added file 'build-ps/debian/percona-server-tokudb-5.6.files'
--- build-ps/debian/percona-server-tokudb-5.6.files	1970-01-01 00:00:00 +0000
+++ build-ps/debian/percona-server-tokudb-5.6.files	2014-06-16 07:08:31 +0000
@@ -0,0 +1,3 @@
+usr/lib/mysql/plugin/ha_tokudb.so
+usr/bin/tokuftdump
+usr/include/tdb-internal.h

=== added file 'build-ps/debian/percona-server-tokudb-5.6.postinst'
--- build-ps/debian/percona-server-tokudb-5.6.postinst	1970-01-01 00:00:00 +0000
+++ build-ps/debian/percona-server-tokudb-5.6.postinst	2014-06-16 07:08:31 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+# Some postinstall info about TokuDB
+if [ -z "$2" ]; then
+	echo -e "\n\n * This release of Percona Server is distributed with TokuDB storage engine."
+	echo -e " * Run the following commands to enable the TokuDB storage engine in Percona Server:\n"
+	echo -e "\tmysql -e \"INSTALL PLUGIN tokudb SONAME 'ha_tokudb.so';\""
+	echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_file_map SONAME 'ha_tokudb.so';\""
+	echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_fractal_tree_info SONAME 'ha_tokudb.so';\""
+	echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_fractal_tree_block_map SONAME 'ha_tokudb.so';\""
+	echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_trx SONAME 'ha_tokudb.so';\""
+	echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_locks SONAME 'ha_tokudb.so';\""
+	echo -e "\tmysql -e \"INSTALL PLUGIN tokudb_lock_waits SONAME 'ha_tokudb.so';\""
+	echo -e "\n * See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details\n\n"
+fi
+
+#DEBHELPER#
+exit 0

=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-06-11 13:45:54 +0000
+++ build-ps/debian/rules	2014-06-16 07:08:31 +0000
@@ -137,7 +137,7 @@
 	rm -rf $(builddir)
 
 	debconf-updatepo
-	rm -f $(EXPORTED_SOURCE_TARBALL)
+	# rm -f $(EXPORTED_SOURCE_TARBALL)
 	dh_clean -v
 
 

=== added file 'build-ps/debian/rules.tokudb'
--- build-ps/debian/rules.tokudb	1970-01-01 00:00:00 +0000
+++ build-ps/debian/rules.tokudb	2014-06-16 07:08:31 +0000
@@ -0,0 +1,279 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+export DEB_BUILD_HARDENING=1
+
+PACKAGE=percona-server-5.6
+PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
+REVISION = '@@REVISION@@'
+COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
+
+TMP=$(CURDIR)/debian/tmp/
+prefix=/usr
+
+ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+NCPU = $(shell grep -c processor /proc/cpuinfo)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
+
+DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p')
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+EXPORTED_SOURCE_TARBALL = debian/percona-server-source-5.6.tar.gz
+
+DISTRIBUTION = $(shell lsb_release -i -s)
+
+MYSQL_SRC = $(shell pwd)
+
+#MAKE_TEST_TARGET=test-mtr
+ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
+# make test-bt is the testsuite run by the MySQL build team 
+# before a release, but it is long
+    MAKE_TEST_TARGET=test-bt
+endif
+
+USE_ASSEMBLER=--enable-assembler 
+
+ifneq (,$(filter $(ARCH), amd64 i386))
+    TESTSUITE_FAIL_CMD=exit 1
+else
+    TESTSUITE_FAIL_CMD=true
+endif
+
+builddir = builddir
+
+configure: patch configure-stamp
+
+configure-stamp:
+	@echo "RULES.$@"
+	dh_testdir
+
+ifneq ($(ARCH_OS),hurd)
+	if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi 
+endif
+
+	[ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
+
+	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
+	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
+	    	CC=$${MYSQL_BUILD_CC:-gcc} \
+	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
+	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
+	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
+	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
+		\
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DWITH_LIBWRAP=ON \
+		-DWITH_ZLIB=system \
+		-DWITH_SSL=system \
+		-DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \
+		-DSYSTEM_TYPE="debian-linux-gnu" \
+		-DINSTALL_LAYOUT=RPM \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DWITH_EMBEDDED_SERVER=OFF \
+		-DWITH_INNODB_MEMCACHED=ON \
+		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
+		-DWITH_FEDERATED_STORAGE_ENGINE=ON \
+		-DWITH_PAM=ON -DWITH_EXTRA_CHARSETS=all \
+		-DWITH_VALGRIND=OFF -DUSE_VALGRIND=OFF -DDEBUG_EXTNAME=OFF -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF \
+		-DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF -DTOKU_DEBUG_PARANOID=OFF ..'
+		
+	touch $@
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp: configure
+	@echo "RULES.$@"
+	dh_testdir
+	
+	[ -f $(EXPORTED_SOURCE_TARBALL) ] || tar -zcf $(EXPORTED_SOURCE_TARBALL) \
+	--exclude=debian . \
+	--transform="s,^\./,percona-server-5.6/,"
+
+	cd $(builddir) && $(MAKE) -j$(NCPU) VERBOSE=1
+
+ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
+	# Don't know why the following is necessary...
+	cp unittest/unit.pl $(builddir)/unittest/
+	cp -r mysql-test/* $(builddir)/mysql-test/
+	cp -r sql/share/* $(builddir)/sql/share/
+	cp -r scripts/*sql $(builddir)/scripts/
+	if [ ! -f testsuite-stamp ] ; then \
+	  (cd $(builddir) && $(MAKE) test-unit) || $(TESTSUITE_FAIL_CMD) ; \
+	  cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
+	fi
+endif
+
+	touch testsuite-stamp
+
+	touch build-stamp
+
+clean: clean-patched
+	rm -rf debian/patched
+
+clean-patched:
+	@echo "RULES.clean-patched"
+	dh_testdir 
+	dh_testroot
+	rm -f configure-stamp*
+	rm -f build-stamp*
+	rm -f testsuite-stamp
+	
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
+	[ ! -d python-for-subunit2junitxml ] || rm -rf python-for-subunit2junitxml
+	
+	rm -rf $(builddir)
+
+	debconf-updatepo
+	# rm -f $(EXPORTED_SOURCE_TARBALL)
+	dh_clean -v
+
+
+install: build
+	@echo "RULES.$@"
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# make install (trailing slash needed for innobase)
+	(cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
+		
+	# After installing, remove rpath to make lintian happy.
+	set +e; \
+	find ./debian/tmp/ -type f -print0 \
+		| xargs -0 --no-run-if-empty chrpath -k 2>/dev/null \
+		| fgrep RPATH= \
+		| cut -d: -f 1 \
+		| xargs --no-run-if-empty chrpath -d; \
+	set -e
+
+	# libperconaserverclient: move shared libraries (but not the rest like libheap.a & co)
+	# libmysqlclient_r is now a symlink to libmysqlclient. But it is
+	# created wrong by the cmake build system and points at
+	# libmysqlclient.so instead of the corresponding versioned lib.
+	for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libperconaserverclient.so*` ; do \
+		rlib=`basename $$i | sed -e 's/libperconaserverclient\./libperconaserverclient_r./'` ;\
+		ln -sf `basename $$i` $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/$$rlib ;\
+	done
+
+	# libmysqlclient-dev: forgotten header file since 3.23.25?
+	#cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
+	#cp include/my_dir.h $(TMP)/usr/include/mysql/
+	# install libmysqld built with -FPIC
+	install -d -m 0755 -o root -g root $(TMP)/usr/lib/percona-server
+	#install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
+	# mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
+	#install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
+
+	# mysql-common: We now provide our own config file.
+	install -d $(TMP)/etc/mysql
+	#install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
+
+	# mysql-client
+	#FIXME install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
+	#FIXME install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
+	#FIXME install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
+
+	# mysql-server
+	mkdir -p $(TMP)/usr/share/doc/percona-server-5.6/examples
+	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/percona-server-5.6/examples/
+	rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
+	       $(TMP)/usr/share/mysql/mysql-log-rotate \
+	       $(TMP)/usr/share/mysql/mysql.server \
+	       $(TMP)/usr/share/mysql/binary-configure
+	nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.6/mysqld.sym.gz
+	# FIXME install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
+	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
+	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
+
+	# install AppArmor profile
+	# FIXME install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
+	# install Apport hook
+	# FIXME install -D -m 644 debian/mysql-server-5.6.py $(TMP)/usr/share/apport/package-hooks/source_mysql-5.6.py
+
+	install -D -m 0644 $(EXPORTED_SOURCE_TARBALL) $(TMP)/usr/src/percona-server/`basename $(EXPORTED_SOURCE_TARBALL)`
+
+	dh_movefiles
+
+# Build architecture-independent files here.
+binary-indep: build install
+	@echo "RULES.binary-indep"
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdebconf -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+	dh_installlogrotate -i
+	dh_installinit -i
+	dh_installcron -i 
+	dh_installman -i
+	dh_installinfo -i
+	dh_installlogcheck -i
+	dh_installchangelogs -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_perl -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: build install
+	@echo "RULES.binary-arch"
+	dh_testdir 
+	dh_testroot
+
+	dh_installdebconf -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installmenu -a
+	dh_installlogrotate -a --name mysql-server
+	if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then if [ "$(DISTRELEASE)"  != "lucid"]; then dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; fi; fi
+	# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
+	# started which might depend on a running database server.
+	dh_installinit -a --name=mysql -- defaults 19 21
+	dh_installcron -a --name mysql-server
+	dh_installman -a
+	dh_installinfo -a
+	dh_installlogcheck -a
+	dh_installchangelogs -a
+	dh_strip -a --dbg-package=percona-server-5.6-dbg
+	dh_lintian
+	dh_link -a	# .so muss nach .so.1.2.3 installier werden!
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+	dh_perl -a
+	#dh_shlibdeps -a -l debian/libmysqlclient16/usr/lib -L libmysqlclient16
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary:	binary-indep binary-arch
+
+override_dh_auto_install:
+	dh_auto_install
+
+.PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch
+
+override_dh_installinit:
+	dh_installinit --name=mysql --error-handler=:

=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-06-11 13:45:54 +0000
+++ build-ps/percona-server.spec	2014-06-16 07:08:31 +0000
@@ -30,6 +30,19 @@
 %define percona_server_version @@PERCONA_VERSION@@
 %define revision @@REVISION@@
 
+#
+%bcond_with tokudb
+#
+%if %{with tokudb}
+  %define TOKUDB_FLAGS -DWITH_VALGRIND=OFF -DUSE_VALGRIND=OFF -DDEBUG_EXTNAME=OFF -DBUILD_TESTING=OFF -DUSE_GTAGS=OFF -DUSE_CTAGS=OFF -DUSE_ETAGS=OFF -DUSE_CSCOPE=OFF
+  %define TOKUDB_DEBUG_ON -DTOKU_DEBUG_PARANOID=ON
+  %define TOKUDB_DEBUG_OFF -DTOKU_DEBUG_PARANOID=OFF
+%else
+  %define TOKUDB_FLAGS %{nil}
+  %define TOKUDB_DEBUG_ON %{nil}
+  %define TOKUDB_DEBUG_OFF %{nil}
+%endif
+#
 %define mysqld_user     mysql
 %define mysqld_group    mysql
 %define mysqldatadir    /var/lib/mysql
@@ -227,6 +240,9 @@
 Distribution:   %{distro_description}
 License:        Copyright (c) 2000, 2010, %{mysql_vendor}.  All rights reserved.  Use is subject to license terms.  Under %{license_type} license as shown in the Description field.
 Source:         http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tar.gz
+%if %{with tokudb}
+Source1:        http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tokudb.tar.gz
+%endif
 URL:            http://www.percona.com/
 Packager:       Percona MySQL Development Team <[e-mail]>
 Vendor:         %{percona_server_vendor}
@@ -273,11 +289,26 @@
 If you want to access and work with the database, you have to install
 package "Percona-Server-client%{product_suffix}" as well!
 
+%if %{with tokudb}
+# ----------------------------------------------------------------------------
+%package -n Percona-Server-tokudb%{product_suffix}
+Summary:        Percona Server - TokuDB
+Group:          Applications/Databases
+Requires:       Percona-Server-server%{product_suffix} = %{version}-%{release}
+Requires:       Percona-Server-shared%{product_suffix} = %{version}-%{release}
+Requires:       Percona-Server-client%{product_suffix} = %{version}-%{release}
+Requires:       jemalloc >= 3.3.0
+Provides:       tokudb-plugin = %{version}-%{release}
+
+%description -n Percona-Server-tokudb%{product_suffix}
+This package contains the TokuDB plugin for Percona Server %{version}-%{release}
+%endif
+
 # ----------------------------------------------------------------------------
 %package -n Percona-Server-client%{product_suffix}
 Summary:        Percona Server - Client
 Group:          Applications/Databases
-Requires:      Percona-Server-shared%{product_suffix}
+Requires:       Percona-Server-shared%{product_suffix}
 Provides:       mysql-client MySQL-client mysql MySQL
 Conflicts:      Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-client-55
 
@@ -331,6 +362,9 @@
 ##############################################################################
 %prep
 %setup -n %{src_dir}
+%if %{with tokudb}
+%setup -n %{src_dir} -T -D -b 1
+%endif
 ##############################################################################
 %build
 
@@ -350,7 +384,11 @@
 RPM_OPT_FLAGS=
 %endif
 #
+%if %{with tokudb}
+RPM_OPT_FLAGS= 
+%else
 RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS} | sed -e 's|-march=i386|-march=i686|g')
+%endif
 #
 export PATH=${MYSQL_BUILD_PATH:-$PATH}
 export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
@@ -399,7 +437,8 @@
            -DINSTALL_SUPPORTFILESDIR=share/percona-server \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_debug}"
+           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" %{TOKUDB_FLAGS} %{TOKUDB_DEBUG_ON}
+
   echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
   make %{?_smp_mflags}
 )
@@ -419,7 +458,8 @@
            -DINSTALL_SUPPORTFILESDIR=share/percona-server \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_release}"
+           -DCOMPILATION_COMMENT="%{compilation_comment_release}" %{TOKUDB_FLAGS} %{TOKUDB_DEBUG_OFF}
+  
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
   make %{?_smp_mflags}
 )
@@ -452,7 +492,7 @@
 %install
 
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}-%{percona_server_version}
+MBD=$RPM_BUILD_DIR/%{src_dir}
 
 # Ensure that needed directories exists
 install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
@@ -484,7 +524,9 @@
 # Install logrotate and autostart
 install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
 install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
-
+#
+%{__rm} -f $RBR/%{_prefix}/README*
+#
 # Delete the symlinks to the libraries from the libdir. These are created by
 # ldconfig(8) afterwards.
 rm -f $RBR%{_libdir}/libmysqlclient*.so.18
@@ -898,6 +940,30 @@
 echo "====="                                     >> $STATUS_HISTORY
 
 
+%if %{with tokudb}
+# ----------------------------------------------------------------------------
+%post -n Percona-Server-tokudb%{product_suffix}
+
+if [ $1 -eq 1 ] ; then
+	echo ""
+	echo "* This release of Percona Server is distributed with TokuDB storage engine."
+	echo "* Run the following commands to enable the TokuDB storage engine in Percona Server:"
+	echo ""
+	echo "mysql -e \"INSTALL PLUGIN tokudb SONAME 'ha_tokudb.so';\""
+	echo "mysql -e \"INSTALL PLUGIN tokudb_file_map SONAME 'ha_tokudb.so';\""
+	echo "mysql -e \"INSTALL PLUGIN tokudb_fractal_tree_info SONAME 'ha_tokudb.so';\""
+	echo "mysql -e \"INSTALL PLUGIN tokudb_fractal_tree_block_map SONAME 'ha_tokudb.so';\""
+	echo "mysql -e \"INSTALL PLUGIN tokudb_trx SONAME 'ha_tokudb.so';\""
+	echo "mysql -e \"INSTALL PLUGIN tokudb_locks SONAME 'ha_tokudb.so';\""
+	echo "mysql -e \"INSTALL PLUGIN tokudb_lock_waits SONAME 'ha_tokudb.so';\""
+	echo ""
+	echo "* See http://www.percona.com/doc/percona-server/5.6/tokudb/tokudb_intro.html for more details"
+	echo ""
+fi
+%endif
+# ----------------------------------------------------------------------------
+
+
 # ----------------------------------------------------------------------
 # Clean up the BuildRoot after build is done
 # ----------------------------------------------------------------------
@@ -982,8 +1048,57 @@
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 %attr(755, root, root) %{_sbindir}/rcmysql
 %attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
-%attr(755, root, root) %{_libdir}/mysql/plugin/*.so*
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/*.so*
+
+#plugins
+%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/innodb_engine.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.*
+%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.*
+%attr(755, root, root) %{_libdir}/mysql/plugin/libmemcached.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.*
+%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_pam_compat.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/dialog.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/handlersocket.so
+
+# %attr(755, root, root) %{_libdir}/mysql/plugin/debug/*.so*
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_pam_compat.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/dialog.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/innodb_engine.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv1a_udf.*
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv_udf.*
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmemcached.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmurmur_udf.*
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/handlersocket.so
+# Audit Log and Scalability Metrics files
+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/scalability_metrics.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/scalability_metrics.so
 
 %if %{WITH_TCMALLOC}
 %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}
@@ -992,7 +1107,48 @@
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
 
-%attr(755, root, root) %{_datadir}/percona-server/
+# %attr(755, root, root) %{_datadir}/percona-server/
+%attr(755, root, root) %{_datadir}/percona-server/binary-configure
+%attr(755, root, root) %{_datadir}/percona-server/bulgarian
+%attr(755, root, root) %{_datadir}/percona-server/charsets
+%attr(755, root, root) %{_datadir}/percona-server/czech
+%attr(755, root, root) %{_datadir}/percona-server/danish
+%attr(755, root, root) %{_datadir}/percona-server/dictionary.txt
+%attr(755, root, root) %{_datadir}/percona-server/dutch
+%attr(755, root, root) %{_datadir}/percona-server/english
+%attr(755, root, root) %{_datadir}/percona-server/errmsg-utf8.txt
+%attr(755, root, root) %{_datadir}/percona-server/estonian
+%attr(755, root, root) %{_datadir}/percona-server/fill_help_tables.sql
+%attr(755, root, root) %{_datadir}/percona-server/french
+%attr(755, root, root) %{_datadir}/percona-server/german
+%attr(755, root, root) %{_datadir}/percona-server/greek
+%attr(755, root, root) %{_datadir}/percona-server/hungarian
+%attr(755, root, root) %{_datadir}/percona-server/innodb_memcached_config.sql
+%attr(755, root, root) %{_datadir}/percona-server/italian
+%attr(755, root, root) %{_datadir}/percona-server/japanese
+%attr(755, root, root) %{_datadir}/percona-server/korean
+%attr(755, root, root) %{_datadir}/percona-server/magic
+%attr(755, root, root) %{_datadir}/percona-server/my-default.cnf
+%attr(755, root, root) %{_datadir}/percona-server/mysqld_multi.server
+%attr(755, root, root) %{_datadir}/percona-server/mysql-log-rotate
+%attr(755, root, root) %{_datadir}/percona-server/mysql_security_commands.sql
+%attr(755, root, root) %{_datadir}/percona-server/mysql.server
+%attr(755, root, root) %{_datadir}/percona-server/mysql_system_tables_data.sql
+%attr(755, root, root) %{_datadir}/percona-server/mysql_system_tables.sql
+%attr(755, root, root) %{_datadir}/percona-server/mysql_test_data_timezone.sql
+%attr(755, root, root) %{_datadir}/percona-server/norwegian
+%attr(755, root, root) %{_datadir}/percona-server/norwegian-ny
+%attr(755, root, root) %{_datadir}/percona-server/polish
+%attr(755, root, root) %{_datadir}/percona-server/portuguese
+%attr(755, root, root) %{_datadir}/percona-server/romanian
+%attr(755, root, root) %{_datadir}/percona-server/russian
+%attr(755, root, root) %{_datadir}/percona-server/SELinux
+%attr(755, root, root) %{_datadir}/percona-server/serbian
+%attr(755, root, root) %{_datadir}/percona-server/slovak
+%attr(755, root, root) %{_datadir}/percona-server/solaris
+%attr(755, root, root) %{_datadir}/percona-server/spanish
+%attr(755, root, root) %{_datadir}/percona-server/swedish
+%attr(755, root, root) %{_datadir}/percona-server/ukrainian
 
 # ----------------------------------------------------------------------------
 %files -n Percona-Server-client%{product_suffix}
@@ -1044,6 +1200,16 @@
 %{_libdir}/*.so
 
 # ----------------------------------------------------------------------------
+%if %{with tokudb}
+%files -n Percona-Server-tokudb%{product_suffix}
+%attr(-, root, root) 
+%{_bindir}/tokuftdump
+%{_includedir}/tdb-internal.h
+%{_libdir}/mysql/plugin/ha_tokudb.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/ha_tokudb.so
+%endif
+
+# ----------------------------------------------------------------------------
 %files -n Percona-Server-shared%{product_suffix}
 %defattr(-, root, root, 0755)
 # Shared libraries (omit for architectures that don't support them)
@@ -1076,6 +1242,10 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Mon May 26 2014 Tomislav Plavcic <[e-mail]>
+
+- Added packaging changes regarding TokuDB
+
 * Thu Feb 10 2011 Ignacio Nin <[e-mail]>
 
 - Removed lines which prevented -debuginfo packages from being built.

=== modified file 'scripts/mysqld_safe.sh'
--- scripts/mysqld_safe.sh	2014-03-16 08:15:10 +0000
+++ scripts/mysqld_safe.sh	2014-06-16 07:08:31 +0000
@@ -375,6 +375,19 @@
 
 
 #
+# Add jemalloc to ld_preload - needed for TokuDB
+#
+for libjemall in "/usr/lib64" "/usr/lib/x86_64-linux-gnu" "/usr/lib"
+do
+if test -f "$libjemall/libjemalloc.so.1"
+then
+  add_mysqld_ld_preload "$libjemall/libjemalloc.so.1"
+  break
+fi
+done
+
+
+#
 # First, try to find BASEDIR and ledir (where mysqld is)
 #
 

=== modified file 'sql/handler.h'
--- sql/handler.h	2014-06-04 14:48:06 +0000
+++ sql/handler.h	2014-06-16 07:08:31 +0000
@@ -395,6 +395,7 @@
   DB_TYPE_MEMCACHE,
   DB_TYPE_FALCON,
   DB_TYPE_MARIA,
+  DB_TYPE_TOKUDB=41,
   /** Performance schema engine. */
   DB_TYPE_PERFORMANCE_SCHEMA,
   DB_TYPE_FIRST_DYNAMIC=42,

=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-06-11 13:45:54 +0000
+++ storage/innobase/include/univ.i	2014-06-16 07:08:31 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 65.0
+#define PERCONA_INNODB_VERSION 66.0
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */