Merge lp:~tplavcic/percona-server/bug1174779-5.1 into lp:percona-server/5.1

Proposed by Tomislav Plavcic on 2014-03-28
Status: Merged
Approved by: Laurynas Biveinis on 2014-03-31
Approved revision: 602
Merged at revision: 610
Proposed branch: lp:~tplavcic/percona-server/bug1174779-5.1
Merge into: lp:percona-server/5.1
Diff against target: 109 lines (+19/-12)
6 files modified
Makefile (+2/-2)
UDF/configure.ac (+1/-1)
build/build-binary.sh (+11/-4)
build/debian/percona-server-server-5.1.postinst (+2/-2)
build/debian/rules (+1/-1)
build/percona-server.spec (+2/-2)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1174779-5.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-03-28 Approve on 2014-03-31
Review via email: mp+213228@code.launchpad.net

This proposal supersedes a proposal from 2014-03-12.

Description of the change

Replaced MaatKit with Percona Toolkit
Fixed build flags

Discussed this with Laurynas over mail and it seems like I've forgot to resubmit MP.
Param build for 5.1 was:
5.1: http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/603/

To post a comment you must log in.
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Double opening quote "" on line 78

review: Needs Fixing
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Throughout all versions no need to link bug 1266387, as it's a duplicate of bug 1174779.

review: Needs Fixing
Tomislav Plavcic (tplavcic) wrote : Posted in a previous version of this proposal

Made another proposal, just not sure I did it right so please check my workflow.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-12-05 07:33:20 +0000
3+++ Makefile 2014-03-28 10:45:59 +0000
4@@ -6,7 +6,7 @@
5 KEWPIE ?=kewpie
6 BASEDIR = $(CURDIR)
7
8-all: main install-lic handlersocket maatkit-udf autorun
9+all: main install-lic handlersocket pt-udf autorun
10 @echo ""
11 @echo "Percona Server source code is ready"
12 @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
13@@ -25,7 +25,7 @@
14 cp -R HandlerSocket-Plugin-for-MySQL $(PERCONA_SERVER)/storage
15 patch -p1 -d $(PERCONA_SERVER)/storage < handlersocket.patch
16
17-maatkit-udf:
18+pt-udf:
19 cp -R UDF "$(PERCONA_SERVER)"
20 cd "$(PERCONA_SERVER)"/UDF && autoreconf --install
21
22
23=== modified file 'UDF/configure.ac'
24--- UDF/configure.ac 2013-10-28 09:14:19 +0000
25+++ UDF/configure.ac 2014-03-28 10:45:59 +0000
26@@ -1,4 +1,4 @@
27-AC_INIT([maatkit-udf], [0.1], [http://code.google.com/p/maatkit/issues/list])
28+AC_INIT([pt-udf], [0.1], [https://bugs.launchpad.net/percona-toolkit])
29 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
30 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
31 LT INIT
32
33=== modified file 'build/build-binary.sh'
34--- build/build-binary.sh 2013-08-27 15:04:34 +0000
35+++ build/build-binary.sh 2014-03-28 10:45:59 +0000
36@@ -115,11 +115,18 @@
37
38 # Compilation flags
39 export CC=${CC:-gcc}
40-export CXX=${CXX:-gcc}
41-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
42-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
43+export CXX=${CXX:-g++}
44+
45+#
46+if [ -n "$(which rpm)" ]; then
47+ export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
48+fi
49+#
50+export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
51+export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
52+#
53 export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
54-
55+#
56 # Create a temporary working directory
57 INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
58 INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR" # Make it absolute
59
60=== modified file 'build/debian/percona-server-server-5.1.postinst'
61--- build/debian/percona-server-server-5.1.postinst 2011-03-18 15:03:47 +0000
62+++ build/debian/percona-server-server-5.1.postinst 2014-03-28 10:45:59 +0000
63@@ -240,12 +240,12 @@
64 set +e
65 echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
66 set -e
67- echo "Percona Server is distributed with several useful UDF (User Defined Function) from Maatkit."
68+ echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
69 echo "Run the following commands to create these functions:"
70 echo "mysql -e \"CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'\""
71 echo "mysql -e \"CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'\""
72 echo "mysql -e \"CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'\""
73- echo "See http://code.google.com/p/maatkit/source/browse/trunk/udf for more details"
74+ echo "See http://www.percona.com/doc/percona-server/5.1/management/udf_percona_toolkit.html for more details"
75 ;;
76
77 abort-upgrade|abort-remove|abort-configure)
78
79=== modified file 'build/debian/rules'
80--- build/debian/rules 2013-09-28 16:06:59 +0000
81+++ build/debian/rules 2014-03-28 10:45:59 +0000
82@@ -204,7 +204,7 @@
83 --prefix="/usr" && \
84 $(MAKE) $(MAKE_JFLAG)
85 cd storage/HandlerSocket-Plugin-for-MySQL && $(MAKE) install DESTDIR=$(TMP)/
86- # build Maatkit UDF
87+ # build Percona Toolkit UDF
88 cd UDF/ && CXX="$${UDF_CXX:-g++}" ./configure --includedir=$(MYSQL_SRC)/include --libdir=/usr/lib/mysql/plugin && $(MAKE) all && $(MAKE) install DESTDIR=$(TMP)/
89
90 # After installing, remove rpath to make lintian happy.
91
92=== modified file 'build/percona-server.spec'
93--- build/percona-server.spec 2013-10-10 05:59:46 +0000
94+++ build/percona-server.spec 2014-03-28 10:45:59 +0000
95@@ -691,12 +691,12 @@
96 sleep 2
97 fi
98
99-echo "Percona Server is distributed with several useful UDF (User Defined Function) from Maatkit."
100+echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
101 echo "Run the following commands to create these functions:"
102 echo "mysql -e \"CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'\""
103 echo "mysql -e \"CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'\""
104 echo "mysql -e \"CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'\""
105-echo "See http://code.google.com/p/maatkit/source/browse/trunk/udf for more details"
106+echo "See http://www.percona.com/doc/percona-server/5.1/management/udf_percona_toolkit.html for more details"
107
108 # Allow mysqld_safe to start mysqld and print a message before we exit
109 sleep 2

Subscribers

People subscribed via source and target branches