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

[Tomislav Plavcic]

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

[Tomislav Plavcic (tplavcic)]

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

[Laurynas Biveinis (laurynas-biveinis)]

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

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Makefile-ps'
--- Makefile-ps	2014-03-25 13:05:17 +0000
+++ Makefile-ps	2014-03-28 10:48:37 +0000
@@ -20,7 +20,7 @@
 REVS = $(shell bzr log | grep rev | head -1   )
 REV  = $(word 2, $(REVS) )
 
-all: maatkit-udf
+all: pt-udf
 	@echo ""
 	@echo "Percona Server source code is ready"
 	@echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
@@ -32,7 +32,7 @@
 	@echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
 	@echo ""
 
-maatkit-udf:
+pt-udf:
 	cd UDF && autoreconf --install
 
 configure: all
 
=== modified file 'UDF/configure.ac'
--- UDF/configure.ac	2013-12-20 02:58:23 +0000
+++ UDF/configure.ac	2014-03-28 10:48:37 +0000
@@ -1,4 +1,4 @@
-AC_INIT([maatkit-udf], [0.1], [http://code.google.com/p/maatkit/issues/list])
+AC_INIT([pt-udf], [0.1], [https://bugs.launchpad.net/percona-toolkit])
 AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
 AC_CONFIG_MACRO_DIR([m4])
 LT INIT
 
=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2014-02-19 12:33:29 +0000
+++ build-ps/build-binary.sh	2014-03-28 10:48:37 +0000
@@ -153,6 +153,7 @@
 
 # Compilation flags
 export CC=${CC:-gcc}
+<<<<<<< TREE
 export CXX=${CXX:-g++}
 #
 if [ -n "$(which rpm)" ]; then
@@ -164,8 +165,20 @@
 export CFLAGS="${COMMON_FLAGS} -static-libgcc -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
 export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
 #
+=======
+export CXX=${CXX:-g++}
+
+#
+if [ -n "$(which rpm)" ]; then
+  export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
+fi
+#
+export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
+export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
+#
+>>>>>>> MERGE-SOURCE
 export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
-
+#
 # Create a temporary working directory
 INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
 INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR"   # Make it absolute
 
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-03-25 13:05:17 +0000
+++ build-ps/percona-server.spec	2014-03-28 10:48:37 +0000
@@ -818,12 +818,12 @@
 	fi
 fi
 
-echo "Percona Server is distributed with several useful UDF (User Defined Function) from Maatkit."
+echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
 echo "Run the following commands to create these functions:"
 echo "mysql -e \"CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'\""
 echo "mysql -e \"CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'\""
 echo "mysql -e \"CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'\""
-echo "See http://code.google.com/p/maatkit/source/browse/trunk/udf for more details"
+echo "See http://www.percona.com/doc/percona-server/5.5/management/udf_percona_toolkit.html for more details"
 
 # Collect an upgrade history ...
 echo "Upgrade/install finished at `date`"        >> $STATUS_FILE
@@ -1120,7 +1120,7 @@
 %{_libdir}/mysql/libhsclient.a
 %{_libdir}/libhsclient.la
 
-# Maatkit UDF libs
+# Percona Toolkit UDF libs
 %{_libdir}/mysql/plugin/libfnv1a_udf.a
 %{_libdir}/mysql/plugin/libfnv1a_udf.la
 %{_libdir}/mysql/plugin/libfnv_udf.a