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

Proposed by Tomislav Plavcic on 2014-08-25
Status: Superseded
Proposed branch: lp:~tplavcic/percona-server/bug1290087-5.5
Merge into: lp:percona-server/5.5
Diff against target: 94 lines (+36/-0)
2 files modified
build-ps/debian/percona-server-server-5.5.files (+1/-0)
build-ps/debian/rules (+35/-0)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1290087-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-08-25 Needs Fixing on 2014-08-26
Review via email: mp+232075@code.launchpad.net

This proposal has been superseded by a proposal from 2014-08-26.

Description of the change

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/

To post a comment you must log in.

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) wrote :

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) wrote :

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.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-ps/debian/percona-server-server-5.5.files'
2--- build-ps/debian/percona-server-server-5.5.files 2014-03-18 16:05:28 +0000
3+++ build-ps/debian/percona-server-server-5.5.files 2014-08-26 12:57:30 +0000
4@@ -23,6 +23,7 @@
5 usr/bin/resolve_stack_dump
6 usr/bin/resolveip
7 usr/sbin/mysqld
8+usr/sbin/mysqld-debug
9 usr/share/man/man1/msql2mysql.1
10 usr/share/man/man1/myisamchk.1
11 usr/share/man/man1/myisamlog.1
12
13=== modified file 'build-ps/debian/rules'
14--- build-ps/debian/rules 2014-08-22 10:09:55 +0000
15+++ build-ps/debian/rules 2014-08-26 12:57:30 +0000
16@@ -7,8 +7,10 @@
17 PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
18 REVISION = '@@REVISION@@'
19 COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
20+COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
21
22 TMP=$(CURDIR)/debian/tmp/
23+TMPD=$(CURDIR)/debian/tmp-debug/
24 prefix=/usr
25
26 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
27@@ -49,6 +51,7 @@
28 endif
29
30 builddir = builddir
31+builddebug = debug
32
33 configure: patch configure-stamp
34
35@@ -60,6 +63,32 @@
36 if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi
37 endif
38
39+ifeq ($(SKIP_DEBUG_BINARY),)
40+ ( test -d $(builddebug) || mkdir $(builddebug) ) && cd $(builddebug) && \
41+ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
42+ CC=$${MYSQL_BUILD_CC:-gcc} \
43+ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -g -fno-strict-aliasing"} \
44+ CXX=$${MYSQL_BUILD_CXX:-g++} \
45+ CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -g -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing"} \
46+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
47+ \
48+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
49+ -DCMAKE_BUILD_TYPE=Debug \
50+ -DWITH_LIBWRAP=ON \
51+ -DWITH_SSL=system \
52+ -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_DEBUG) \
53+ -DSYSTEM_TYPE="debian-linux-gnu" \
54+ -DINSTALL_LAYOUT=RPM \
55+ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
56+ -DINSTALL_PLUGINDIR=lib/mysql/plugin/debug \
57+ -DWITH_EMBEDDED_SERVER=OFF \
58+ -DWITH_ARCHIVE_STORAGE_ENGINE=ON \
59+ -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
60+ -DWITH_FEDERATED_STORAGE_ENGINE=ON \
61+ -DWITH_PAM=ON \
62+ -DWITH_EXTRA_CHARSETS=all ..'
63+endif
64+
65 ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
66 sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
67 CC=$${MYSQL_BUILD_CC:-gcc} \
68@@ -98,6 +127,10 @@
69 --exclude=debian . \
70 --transform="s,^\./,percona-server-5.5/,"
71
72+ifeq ($(SKIP_DEBUG_BINARY),)
73+ cd $(builddebug) && $(MAKE) $(MAKE_JFLAG)
74+endif
75+
76 cd $(builddir) && $(MAKE) $(MAKE_JFLAG) VERBOSE=1
77
78 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
79@@ -129,6 +162,7 @@
80 [ ! -d mysql-test/var ] || rm -rf mysql-test/var
81
82 rm -rf $(builddir)
83+ rm -rf $(builddebug)
84
85 debconf-updatepo
86 rm -f $(EXPORTED_SOURCE_TARBALL)
87@@ -143,6 +177,7 @@
88 dh_installdirs
89
90 # make install (trailing slash needed for innobase)
91+ (cd $(builddebug) && $(MAKE) install DESTDIR=$(TMPD)/)
92 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
93
94 # build HandlerSocket

Subscribers

People subscribed via source and target branches