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

[Tomislav Plavcic]

Replaced MaatKit with Percona Toolkit
Fixed build flags

[Laurynas Biveinis (laurynas-biveinis)]

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)]

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

=== modified file 'Makefile-ps'
--- Makefile-ps	2014-03-12 11:44:53 +0000
+++ Makefile-ps	2014-03-12 22:49:15 +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 03:15:04 +0000
+++ UDF/configure.ac	2014-03-12 22:49:15 +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:26:30 +0000
+++ build-ps/build-binary.sh	2014-03-12 22:49:15 +0000
@@ -158,11 +158,9 @@
 #
 if [ -n "$(which rpm)" ]; then
   export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
-else
-  export COMMON_FLAGS="-O2 -g"
 fi
 #
-export CFLAGS="${COMMON_FLAGS} -static-libgcc -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
+export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
 export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
 #
 export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"

=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-03-12 11:44:53 +0000
+++ build-ps/percona-server.spec	2014-03-12 22:49:15 +0000
@@ -805,12 +805,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.6/management/udf_percona_toolkit.html for more details"
 
 # Collect an upgrade history ...
 echo "Upgrade/install finished at `date`"        >> $STATUS_FILE
@@ -1060,7 +1060,7 @@
 %{_libdir}/mysql/libmysqlservices.a
 %{_libdir}/*.so
 
-# 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