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

Proposed by Tomislav Plavcic on 2014-03-28
Status: Merged
Approved by: Laurynas Biveinis on 2014-03-31
Approved revision: 625
Merged at revision: 648
Proposed branch: lp:~tplavcic/percona-server/bug1174779-5.5
Merge into: lp:percona-server/5.5
Diff against target: 93 lines (+20/-7) (has conflicts)
4 files modified
Makefile-ps (+2/-2)
UDF/configure.ac (+1/-1)
build-ps/build-binary.sh (+14/-1)
build-ps/percona-server.spec (+3/-3)
Text conflict in build-ps/build-binary.sh
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1174779-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-03-28 Approve on 2014-03-31
Review via email: mp+213229@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.5 was:
https://code.launchpad.net/~tplavcic/percona-server/bug1174779-5.5/+merge/210706

To post a comment you must log in.
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.

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

It is not an upmerge from 5.1. If it were, the output below would be empty, and bzr merge ../bug1174779-5.1 would be a no-op.

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

bug1174779-5.5$ bzr missing --theirs-only ../bug1174779-5.1/
You are missing 2 revisions:
------------------------------------------------------------
revno: 597 [merge]
committer: Tomislav Plavcic <email address hidden>
branch nick: 5.1
timestamp: Fri 2014-03-07 00:03:40 +0100
message:
  Merged with trunk
------------------------------------------------------------
revno: 596
committer: Tomislav Plavcic <email address hidden>
branch nick: 5.1
timestamp: Fri 2014-03-07 00:01:16 +0100
message:
  Replaced MaatKit with Percona Toolkit
  Updated compilation flags

review: Needs Fixing
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-25 13:05:17 +0000
3+++ Makefile-ps 2014-03-28 10:48:37 +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 02:58:23 +0000
25+++ UDF/configure.ac 2014-03-28 10:48:37 +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:33:29 +0000
35+++ build-ps/build-binary.sh 2014-03-28 10:48:37 +0000
36@@ -153,6 +153,7 @@
37
38 # Compilation flags
39 export CC=${CC:-gcc}
40+<<<<<<< TREE
41 export CXX=${CXX:-g++}
42 #
43 if [ -n "$(which rpm)" ]; then
44@@ -164,8 +165,20 @@
45 export CFLAGS="${COMMON_FLAGS} -static-libgcc -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
46 export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
47 #
48+=======
49+export CXX=${CXX:-g++}
50+
51+#
52+if [ -n "$(which rpm)" ]; then
53+ export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
54+fi
55+#
56+export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
57+export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
58+#
59+>>>>>>> MERGE-SOURCE
60 export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
61-
62+#
63 # Create a temporary working directory
64 INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
65 INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR" # Make it absolute
66
67=== modified file 'build-ps/percona-server.spec'
68--- build-ps/percona-server.spec 2014-03-25 13:05:17 +0000
69+++ build-ps/percona-server.spec 2014-03-28 10:48:37 +0000
70@@ -818,12 +818,12 @@
71 fi
72 fi
73
74-echo "Percona Server is distributed with several useful UDF (User Defined Function) from Maatkit."
75+echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
76 echo "Run the following commands to create these functions:"
77 echo "mysql -e \"CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'\""
78 echo "mysql -e \"CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'\""
79 echo "mysql -e \"CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'\""
80-echo "See http://code.google.com/p/maatkit/source/browse/trunk/udf for more details"
81+echo "See http://www.percona.com/doc/percona-server/5.5/management/udf_percona_toolkit.html for more details"
82
83 # Collect an upgrade history ...
84 echo "Upgrade/install finished at `date`" >> $STATUS_FILE
85@@ -1120,7 +1120,7 @@
86 %{_libdir}/mysql/libhsclient.a
87 %{_libdir}/libhsclient.la
88
89-# Maatkit UDF libs
90+# Percona Toolkit UDF libs
91 %{_libdir}/mysql/plugin/libfnv1a_udf.a
92 %{_libdir}/mysql/plugin/libfnv1a_udf.la
93 %{_libdir}/mysql/plugin/libfnv_udf.a

Subscribers

People subscribed via source and target branches