Merge lp:~tplavcic/percona-server/bug1290087-5.5 into lp:percona-server/5.5

[Tomislav Plavcic]

Build for mysqld-debug and plugin/debug has been added to debian packages.
Test was done by building packages and inspecting content to see if files are in place.
Note that in the jenkins links first job for 5.6 has failed on ubuntu-precise but that is because
of the older version of cmake on that host (JEN-256 has been opened for this).
If param job needs to be runned for this change please notify me.

5.5 packages
http://jenkins.percona.com/view/TEST/job/percona-server-5.5-debian-binary-test/

5.6 packages
http://jenkins.percona.com/view/TEST/job/percona-server-5.6-debian-binary-test/
http://jenkins.percona.com/view/TEST/job/percona-server-5.6-debian-binary-32-test/

[Laurynas Biveinis (laurynas-biveinis)]

Can you please add -DWITH_DEBUG=ON in addition to -DCMAKE_BUILD_TYPE=Debug? This bit is not a regression to our previous packaging, but avoids http://bugs.mysql.com/bug.php?id=70647

review: Needs Fixing

[Tomislav Plavcic (tplavcic)]

I guess that depends on which version of TokuDB we will include in this release because of this:
https://groups.google.com/a/percona.com/forum/#!topic/percona-tokutek/si8zKhdptyo
So until we start building from tokudb-7.1.8-rc1 or higher I don't think we can include it.
I think Hrvoje is waiting on input from PeterS on which tag will be included.

[Tomislav Plavcic (tplavcic)]

As discussed over IRC opened https://bugs.launchpad.net/percona-server/+bug/1361658
for -DWITH_DEBUG=ON as this MP will be merged without it.

[Tomislav Plavcic (tplavcic)]

review: Approve

=== modified file 'build-ps/debian/percona-server-server-5.5.files'
--- build-ps/debian/percona-server-server-5.5.files	2014-03-18 16:05:28 +0000
+++ build-ps/debian/percona-server-server-5.5.files	2014-08-26 13:59:45 +0000
@@ -23,6 +23,7 @@
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
 usr/sbin/mysqld
+usr/sbin/mysqld-debug
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisamlog.1
 
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-08-22 10:09:55 +0000
+++ build-ps/debian/rules	2014-08-26 13:59:45 +0000
@@ -7,8 +7,10 @@
 PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
 REVISION = '@@REVISION@@'
 COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
+COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
 
 TMP=$(CURDIR)/debian/tmp/
+TMPD=$(CURDIR)/debian/tmp-debug/
 prefix=/usr
 
 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -49,6 +51,7 @@
 endif
 
 builddir = builddir
+builddebug = debug
 
 configure: patch configure-stamp
 
@@ -60,6 +63,32 @@
 	if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi 
 endif
 
+ifeq ($(SKIP_DEBUG_BINARY),)
+	( test -d $(builddebug) || mkdir $(builddebug) ) && cd $(builddebug) && \
+	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=Debug \
+		-DWITH_LIBWRAP=ON \
+		-DWITH_SSL=system \
+		-DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \
+		-DSYSTEM_TYPE="debian-linux-gnu" \
+		-DINSTALL_LAYOUT=RPM \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin/debug \
+		-DWITH_EMBEDDED_SERVER=OFF \
+		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
+		-DWITH_FEDERATED_STORAGE_ENGINE=ON \
+		-DWITH_PAM=ON \
+		-DWITH_EXTRA_CHARSETS=all ..'
+endif
+
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
@@ -98,6 +127,10 @@
 	--exclude=debian . \
 	--transform="s,^\./,percona-server-5.5/,"
 
+ifeq ($(SKIP_DEBUG_BINARY),)
+	cd $(builddebug) && $(MAKE) $(MAKE_JFLAG)
+endif
+
 	cd $(builddir) && $(MAKE) $(MAKE_JFLAG) VERBOSE=1
 
 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -129,6 +162,7 @@
 	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 	
 	rm -rf $(builddir)
+	rm -rf $(builddebug)
 
 	debconf-updatepo
 	rm -f $(EXPORTED_SOURCE_TARBALL)
@@ -143,6 +177,7 @@
 	dh_installdirs
 
 	# make install (trailing slash needed for innobase)
+	(cd $(builddebug) && $(MAKE) install DESTDIR=$(TMPD)/)
 	(cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
 	
 	# build HandlerSocket