Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~ignacio-nin/percona-server/5.6-debian---source into lp:percona-server/5.6

  1. 5.6-debian---source
  2. Merge into 5.6
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 343
Proposed branch: lp:~ignacio-nin/percona-server/5.6-debian---source
Merge into: lp:percona-server/5.6
Prerequisite: lp:~ignacio-nin/percona-server/5.6-debian---epoch
Diff against target: 278 lines (+83/-55)
8 files modified
build/build-binary.sh (+1/-1)
build/build-dpkg.sh (+17/-7)
build/build-rpm.sh (+1/-1)
build/debian/control (+14/-4)
build/debian/percona-server-server-5.6.docs (+2/-2)
build/debian/percona-server-server-5.6.install (+1/-0)
build/debian/rules (+46/-39)
build/percona-server.spec (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-debian---source
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+162053@code.launchpad.net

Description of the change

Merge the changes from the corresponding 5.5 branch.

As with 5.5 and 5.1, merge the --epoch change from the already-approved prerrequisite branch to prevent conflicts when merging.

Remove -fno-exceptions from CXXFLAGS. Since 5.6 is built with CXX=g++, it's no longer possible to have -fno-exceptions in the CXXFLAGS, since it won't build. This flag was important when we built with CXX=gcc (5.1 and 5.5).

Port the --nodebug parameter from 5.5 (already was null-merged, copied).

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/build-binary.sh'
--- build/build-binary.sh 2013-04-15 12:12:53 +0000
+++ build/build-binary.sh 2013-05-02 08:49:30 +0000
@@ -108,7 +108,7 @@
108export CC=${CC:-gcc}108export CC=${CC:-gcc}
109export CXX=${CXX:-g++}109export CXX=${CXX:-g++}
110export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"110export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
111export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"111export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
112export MAKE_JFLAG=-j4112export MAKE_JFLAG=-j4
113113
114# Create a temporary working directory114# Create a temporary working directory
115115
=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh 2013-05-02 08:49:29 +0000
+++ build/build-dpkg.sh 2013-05-02 08:49:30 +0000
@@ -12,15 +12,16 @@
12set -ue12set -ue
1313
14# Examine parameters14# Examine parameters
15go_out="$(getopt --options "k:Ke:b" \15go_out="$(getopt --options "k:Ke:bDS" \
16 --longoptions key:,nosign,epoch:binary \16 --longoptions key:,nosign,epoch:,binary,nodebug,source \
17 --name "$(basename "$0")" -- "$@")"17 --name "$(basename "$0")" -- "$@")"
18test $? -eq 0 || exit 118test $? -eq 0 || exit 1
19eval set -- $go_out19eval set -- $go_out
2020
21BUILDPKG_KEY=''21BUILDPKG_KEY=''
22EPOCH=''22EPOCH=''
23BINARY=''23DPKG_BINSRC=''
24SKIPDEBUG=''
2425
25for arg26for arg
26do27do
@@ -29,7 +30,9 @@
29 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;30 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
30 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;31 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
31 -e | --epoch ) shift; EPOCH="$1:"; shift;;32 -e | --epoch ) shift; EPOCH="$1:"; shift;;
32 -b | --binary ) shift; BINARY='-b';;33 -b | --binary ) shift; DPKG_BINSRC='-b';;
34 -D | --nodebug ) shift; SKIPDEBUG='yes';;
35 -S | --source ) shift; DPKG_BINSRC='-S';;
33 esac36 esac
34done37done
3538
@@ -76,13 +79,13 @@
7679
77# Build information80# Build information
78export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"81export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"
79export DEB_BUILD_OPTIONS='nostrip debug nocheck'82export DEB_BUILD_OPTIONS='debug'
8083
81# Compilation flags84# Compilation flags
82export CC=${CC:-gcc}85export CC=${CC:-gcc}
83export CXX=${CXX:-g++}86export CXX=${CXX:-g++}
84export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"87export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"
85export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"88export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"
86export MAKE_JFLAG=-j489export MAKE_JFLAG=-j4
8790
88# Prepare sources91# Prepare sources
@@ -105,11 +108,18 @@
105 cp -R "$SOURCEDIR/build/debian" .108 cp -R "$SOURCEDIR/build/debian" .
106 chmod +x debian/rules109 chmod +x debian/rules
107110
111 # If nodebug is set, do not ship mysql-debug
112 if test "x$SKIPDEBUG" = "xyes"
113 then
114 sed -i '/mysqld-debug/d' debian/percona-server-server-5.6.install
115 fi
116
108 # Update distribution name117 # Update distribution name
109 dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$EPOCH$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'118 dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$EPOCH$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
110119
111 DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \120 DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
112 dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY121 SKIP_DEBUG_BINARY="$SKIPDEBUG" \
122 dpkg-buildpackage $DPKG_BINSRC -rfakeroot $BUILDPKG_KEY
113123
114 )124 )
115125
116126
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh 2013-04-23 05:55:00 +0000
+++ build/build-rpm.sh 2013-05-02 08:49:30 +0000
@@ -116,7 +116,7 @@
116export HS_CXX="${HS_CXX:-g++}"116export HS_CXX="${HS_CXX:-g++}"
117export UDF_CXX="${UDF_CXX:-g++}"117export UDF_CXX="${UDF_CXX:-g++}"
118export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"118export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
119export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"119export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
120export MAKE_JFLAG=-j4120export MAKE_JFLAG=-j4
121121
122# Create directories for rpmbuild if these don't exist122# Create directories for rpmbuild if these don't exist
123123
=== modified file 'build/debian/control'
--- build/debian/control 2013-04-23 05:55:00 +0000
+++ build/debian/control 2013-05-02 08:49:30 +0000
@@ -3,11 +3,10 @@
3Priority: extra3Priority: extra
4Maintainer: Percona Server Development Team <mysql-dev@percona.com>4Maintainer: Percona Server Development Team <mysql-dev@percona.com>
5Uploaders: Ignacio Nin <ignacio.nin@percona.com>5Uploaders: Ignacio Nin <ignacio.nin@percona.com>
6Build-Depends: debhelper (>= 7.0), dpatch, cmake, libtool, automake, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev6Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, dpatch, automake
7Standards-Version: 3.9.17Standards-Version: 7.0.0
8Homepage: http://www.percona.com/software/percona-server/8Homepage: http://www.percona.com/software/percona-server/
9Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~percona-core/percona-server/5.69Vcs-Bzr: lp:percona-server/5.6
10Vcs-Browser: http://bazaar.launchpad.net/~percona-core/percona-server/5.6
1110
12Package: libmysqlclient1811Package: libmysqlclient18
13Section: libs12Section: libs
@@ -133,3 +132,14 @@
133 about which Percona Server version you want, as this is the one we consider 132 about which Percona Server version you want, as this is the one we consider
134 to be in the best shape.133 to be in the best shape.
135134
135Package: percona-server-5.6-dbg
136Architecture: any
137Section: debug
138Depends: percona-server-server-5.6 (= ${binary:Version}), ${misc:Depends}
139Description: Debugging package for Percona Server
140 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
141 database server. SQL (Structured Query Language) is the most popular database
142 query language in the world. The main goals of Percona Server are speed,
143 robustness and ease of use.
144 .
145 This package contains the debugging symbols for the Percona Server binaries.
136146
=== modified file 'build/debian/percona-server-server-5.6.docs'
--- build/debian/percona-server-server-5.6.docs 2013-04-05 17:19:56 +0000
+++ build/debian/percona-server-server-5.6.docs 2013-05-02 08:49:30 +0000
@@ -4,5 +4,5 @@
4COPYING*4COPYING*
5Docs/INSTALL-BINARY5Docs/INSTALL-BINARY
6Docs/mysql.info6Docs/mysql.info
7Docs/INFO_BIN7release/Docs/INFO_BIN
8Docs/INFO_SRC8release/Docs/INFO_SRC
99
=== modified file 'build/debian/percona-server-server-5.6.install'
--- build/debian/percona-server-server-5.6.install 2013-04-05 20:10:21 +0000
+++ build/debian/percona-server-server-5.6.install 2013-05-02 08:49:30 +0000
@@ -23,6 +23,7 @@
23usr/bin/resolve_stack_dump23usr/bin/resolve_stack_dump
24usr/bin/resolveip24usr/bin/resolveip
25usr/sbin/mysqld25usr/sbin/mysqld
26usr/sbin/mysqld-debug
26usr/share/man/man1/msql2mysql.127usr/share/man/man1/msql2mysql.1
27usr/share/man/man1/myisamchk.128usr/share/man/man1/myisamchk.1
28usr/share/man/man1/myisamlog.129usr/share/man/man1/myisamlog.1
2930
=== modified file 'build/debian/rules'
--- build/debian/rules 2013-04-23 05:55:00 +0000
+++ build/debian/rules 2013-05-02 08:49:30 +0000
@@ -18,60 +18,67 @@
18 dh clean18 dh clean
19 rm -rf CMakeFiles19 rm -rf CMakeFiles
2020
21build: patch21override_dh_auto_configure: patch
22 dh_testdir22ifeq ($(SKIP_DEBUG_BINARY),)
23 $(CMAKE) . -DBUILD_CONFIG=mysql_release \23 # Make a debug binary
24 -DINSTALL_LAYOUT=DEB \24 mkdir debug
25 -DCMAKE_BUILD_TYPE=RelWithDebInfo \25 cd debug && \
26 -DWITH_EMBEDDED_SERVER=OFF \26 $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
27 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \27 -DINSTALL_LAYOUT=DEB \
28 -DFEATURE_SET=$(feature_set) \28 -DCMAKE_BUILD_TYPE=Debug \
29 -DCOMPILATION_COMMENT=$(compilation_comment_release) \29 -DWITH_EMBEDDED_SERVER=OFF \
30 -DMYSQL_SERVER_SUFFIX=$(server_suffix)30 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
31 make $(MAKE_JFLAG)31 -DFEATURE_SET=$(feature_set) \
32 -DCOMPILATION_COMMENT=$(compilation_comment_debug) \
33 -DMYSQL_SERVER_SUFFIX=$(server_suffix)
34endif
35
36 mkdir release
37 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
38 -DINSTALL_LAYOUT=DEB \
39 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
40 -DWITH_EMBEDDED_SERVER=OFF \
41 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
42 -DFEATURE_SET=$(feature_set) \
43 -DCOMPILATION_COMMENT=$(compilation_comment_release) \
44 -DMYSQL_SERVER_SUFFIX=$(server_suffix)
32 45
46override_dh_auto_build:
47ifeq ($(SKIP_DEBUG_BINARY),)
48 cd debug && make $(MAKE_JFLAG)
49endif
50
51 cd release && make $(MAKE_JFLAG)
52
33 # Build UDF53 # Build UDF
34 cd UDF && \54 cd UDF && \
35 CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/include" \55 CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
36 ./configure --includedir=$(CURDIR)/include \56 ./configure --includedir=$(CURDIR)/include \
37 --libdir=$(prefix)/lib/mysql/plugin && \57 --libdir=$(prefix)/lib/mysql/plugin && \
38 make $(MAKE_JFLAG)58 make $(MAKE_JFLAG)
39 59
40 dh_auto_test60build:
61 dh build
4162
42binary:63binary:
43 echo "Making binary"64 dh -Brelease binary
44 dh --before dh_auto_install binary
45 dh_auto_install
46 cd UDF && make DESTDIR=$(TMP) install
47 dh --after dh_auto_install --before dh_installinit binary
48 dh_installinit --name=mysql
49 dh --after dh_installinit binary
50
5165
52binary-arch:66binary-arch:
53 echo "Making binary"67 dh -Brelease binary-arch
54 dh --before dh_auto_install binary-arch
55 dh_auto_install
56 cd UDF && make DESTDIR=$(TMP) install
57 dh --after dh_auto_install --before dh_installinit binary-arch
58 dh_installinit --name=mysql
59 dh --after dh_installinit binary-arch
6068
61binary-indep:69binary-indep:
62 echo "Making binary"70 dh -Brelease binary-indep
63 dh --before dh_auto_install binary-indep
64 dh_auto_install
65 cd UDF && make DESTDIR=$(TMP) install
66 dh --after dh_auto_install --before dh_installinit binary-indep
67 dh_installinit --name=mysql
68 dh --after dh_installinit binary-indep
6971
70install:72install:
71 echo "Making binary"73 dh install
72 dh --before dh_auto_install install74
75override_dh_auto_install:
73 dh_auto_install76 dh_auto_install
74 cd UDF && make DESTDIR=$(TMP) install77 cd UDF && make DESTDIR=$(TMP) install
75 dh --after dh_auto_install --before dh_installinit install78
79override_dh_installinit:
76 dh_installinit --name=mysql80 dh_installinit --name=mysql
77 dh --after dh_installinit install81
82override_dh_strip:
83 dh_strip --dbg-package=percona-server-5.6-dbg
84
7885
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-04-23 05:55:00 +0000
+++ build/percona-server.spec 2013-05-02 08:49:30 +0000
@@ -376,7 +376,7 @@
376export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}376export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
377export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}377export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
378export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}378export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
379export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}379export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-rtti}}
380export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}380export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
381export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}381export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
382export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-${MAKE_JFLAG:-}}382export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-${MAKE_JFLAG:-}}

Subscribers

People subscribed via source and target branches