Percona Server moved to https://jira.percona.com/projects/PS

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

  1. bug1174779-5.6
  2. Merge into 5.6
Proposed by Tomislav Plavcic
Status: Superseded
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 Pending
Review via email: mp+209805@code.launchpad.net

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

This proposal has been superseded by a proposal from 2014-03-12.

Description of the change

Replaced MaatKit with Percona Toolkit
Fixed build flags

To post a comment you must log in.
Revision history for this message
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
Revision history for this message
Tomislav Plavcic (tplavcic) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile-ps'
--- Makefile-ps 2014-03-12 11:44:53 +0000
+++ Makefile-ps 2014-03-12 22:41:22 +0000
@@ -20,7 +20,7 @@
20REVS = $(shell bzr log | grep rev | head -1 )20REVS = $(shell bzr log | grep rev | head -1 )
21REV = $(word 2, $(REVS) )21REV = $(word 2, $(REVS) )
2222
23all: maatkit-udf23all: pt-udf
24 @echo ""24 @echo ""
25 @echo "Percona Server source code is ready"25 @echo "Percona Server source code is ready"
26 @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"26 @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
@@ -32,7 +32,7 @@
32 @echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"32 @echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
33 @echo ""33 @echo ""
3434
35maatkit-udf:35pt-udf:
36 cd UDF && autoreconf --install36 cd UDF && autoreconf --install
3737
38configure: all38configure: all
3939
=== modified file 'UDF/configure.ac'
--- UDF/configure.ac 2013-12-20 03:15:04 +0000
+++ UDF/configure.ac 2014-03-12 22:41:22 +0000
@@ -1,4 +1,4 @@
1AC_INIT([maatkit-udf], [0.1], [http://code.google.com/p/maatkit/issues/list])1AC_INIT([pt-udf], [0.1], [https://bugs.launchpad.net/percona-toolkit])
2AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])2AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
3AC_CONFIG_MACRO_DIR([m4])3AC_CONFIG_MACRO_DIR([m4])
4LT INIT4LT INIT
55
=== 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:41:22 +0000
@@ -158,11 +158,9 @@
158#158#
159if [ -n "$(which rpm)" ]; then159if [ -n "$(which rpm)" ]; then
160 export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")160 export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
161else
162 export COMMON_FLAGS="-O2 -g"
163fi161fi
164#162#
165export CFLAGS="${COMMON_FLAGS} -static-libgcc -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"163export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
166export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"164export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
167#165#
168export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"166export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
169167
=== 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:41:22 +0000
@@ -805,12 +805,12 @@
805 fi805 fi
806fi806fi
807807
808echo "Percona Server is distributed with several useful UDF (User Defined Function) from Maatkit."808echo "Percona Server is distributed with several useful UDF (User Defined Function) from Percona Toolkit."
809echo "Run the following commands to create these functions:"809echo "Run the following commands to create these functions:"
810echo "mysql -e \"CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'\""810echo "mysql -e \"CREATE FUNCTION fnv1a_64 RETURNS INTEGER SONAME 'libfnv1a_udf.so'\""
811echo "mysql -e \"CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'\""811echo "mysql -e \"CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so'\""
812echo "mysql -e \"CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'\""812echo "mysql -e \"CREATE FUNCTION murmur_hash RETURNS INTEGER SONAME 'libmurmur_udf.so'\""
813echo "See http://code.google.com/p/maatkit/source/browse/trunk/udf for more details"813echo "See http://www.percona.com/doc/percona-server/5.6/management/udf_percona_toolkit.html for more details"
814814
815# Collect an upgrade history ...815# Collect an upgrade history ...
816echo "Upgrade/install finished at `date`" >> $STATUS_FILE816echo "Upgrade/install finished at `date`" >> $STATUS_FILE
@@ -1060,7 +1060,7 @@
1060%{_libdir}/mysql/libmysqlservices.a1060%{_libdir}/mysql/libmysqlservices.a
1061%{_libdir}/*.so1061%{_libdir}/*.so
10621062
1063# Maatkit UDF libs1063# Percona Toolkit UDF libs
1064%{_libdir}/mysql/plugin/libfnv1a_udf.a1064%{_libdir}/mysql/plugin/libfnv1a_udf.a
1065%{_libdir}/mysql/plugin/libfnv1a_udf.la1065%{_libdir}/mysql/plugin/libfnv1a_udf.la
1066%{_libdir}/mysql/plugin/libfnv_udf.a1066%{_libdir}/mysql/plugin/libfnv_udf.a

Subscribers

People subscribed via source and target branches