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

Proposed by Tomislav Plavcic on 2014-03-28
Status: Merged
Approved by: Laurynas Biveinis on 2014-03-31
Approved revision: 557
Merged at revision: 574
Proposed branch: lp:~tplavcic/percona-server/bug1174779-5.6
Merge into: lp:percona-server/5.6
Diff against target: 76 lines (+7/-9)
4 files modified
Makefile-ps (+2/-2)
UDF/configure.ac (+1/-1)
build-ps/build-binary.sh (+1/-3)
build-ps/percona-server.spec (+3/-3)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1174779-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-03-28 Approve on 2014-03-31
Review via email: mp+213232@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.6 was:
https://code.launchpad.net/~tplavcic/percona-server/bug1174779-5.6/+merge/210708

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

Needs rebasing on the current trunk to resolve the conflicts.

(the lower versions have conflicts too, you can try rebasing those branches as well, as GCA revision has advanced yesterday, but the conflicts there might be unavoidable for a GCA rev and will have to be resolved during the merge to trunk).

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-ps'
2--- Makefile-ps 2014-03-24 15:57:34 +0000
3+++ Makefile-ps 2014-03-28 10:50:28 +0000
4@@ -20,7 +20,7 @@
5 REVS = $(shell bzr log | grep rev | head -1 )
6 REV = $(word 2, $(REVS) )
7
8-all: maatkit-udf
9+all: pt-udf
10 @echo ""
11 @echo "Percona Server source code is ready"
12 @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
13@@ -32,7 +32,7 @@
14 @echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
15 @echo ""
16
17-maatkit-udf:
18+pt-udf:
19 cd UDF && autoreconf --install
20
21 configure: all
22
23=== modified file 'UDF/configure.ac'
24--- UDF/configure.ac 2013-12-20 03:15:04 +0000
25+++ UDF/configure.ac 2014-03-28 10:50:28 +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 AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
30 AC_CONFIG_MACRO_DIR([m4])
31 LT INIT
32
33=== modified file 'build-ps/build-binary.sh'
34--- build-ps/build-binary.sh 2014-02-19 12:26:30 +0000
35+++ build-ps/build-binary.sh 2014-03-28 10:50:28 +0000
36@@ -158,11 +158,9 @@
37 #
38 if [ -n "$(which rpm)" ]; then
39 export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
40-else
41- export COMMON_FLAGS="-O2 -g"
42 fi
43 #
44-export CFLAGS="${COMMON_FLAGS} -static-libgcc -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
45+export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
46 export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
47 #
48 export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
49
50=== modified file 'build-ps/percona-server.spec'
51--- build-ps/percona-server.spec 2014-03-24 10:52:19 +0000
52+++ build-ps/percona-server.spec 2014-03-28 10:50:28 +0000
53@@ -811,12 +811,12 @@
54 fi
55 fi
56
57-echo "Percona Server is distributed with several useful UDF (User Defined Function) from Maatkit."
58+echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
59 echo "Run the following commands to create these functions:"
60 echo "mysql -e \"CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'\""
61 echo "mysql -e \"CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'\""
62 echo "mysql -e \"CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'\""
63-echo "See http://code.google.com/p/maatkit/source/browse/trunk/udf for more details"
64+echo "See http://www.percona.com/doc/percona-server/5.6/management/udf_percona_toolkit.html for more details"
65
66 # Collect an upgrade history ...
67 echo "Upgrade/install finished at `date`" >> $STATUS_FILE
68@@ -1066,7 +1066,7 @@
69 %{_libdir}/mysql/libmysqlservices.a
70 %{_libdir}/*.so
71
72-# Maatkit UDF libs
73+# Percona Toolkit UDF libs
74 %{_libdir}/mysql/plugin/libfnv1a_udf.a
75 %{_libdir}/mysql/plugin/libfnv1a_udf.la
76 %{_libdir}/mysql/plugin/libfnv_udf.a

Subscribers

People subscribed via source and target branches