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

Merge lp:~abychko/percona-server/percona-server-55-BLD-80 into lp:percona-server/5.5

  1. percona-server-55-BLD-80
  2. Merge into 5.5
Proposed by Alexey Bychko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 664
Proposed branch: lp:~abychko/percona-server/percona-server-55-BLD-80
Merge into: lp:percona-server/5.5
Diff against target: 177 lines (+13/-59)
7 files modified
UDF/Makefile.am (+0/-3)
UDF/configure.ac (+0/-10)
UDF/src/Makefile.am (+0/-7)
build-ps/build-binary.sh (+1/-1)
build-ps/debian/rules (+1/-8)
build-ps/percona-server.spec (+8/-30)
plugin/percona-udf/CMakeLists.txt (+3/-0)
To merge this branch: bzr merge lp:~abychko/percona-server/percona-server-55-BLD-80
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+220925@code.launchpad.net

Description of the change

http://jenkins.percona.com/job/percona-server-5.5-RELEASE/94/ - fix passed full release build cycle

Jira internal tickets:
 * https://jira.percona.com/browse/PS-135
 * https://jira.percona.com/browse/BLD-80

changes:
 * HS has been moved from storage to plugin, build is left automake-based, as discussed in PS-135
 * UDF has been moved from root to plugin directory
 * UDF has been ported to cmake

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

- Please run a param job on this branch as well (http://jenkins.percona.com/job/percona-server-5.5-param/) or we risk bug 1323014 again (such changes are not only packaging, but the source code build related too, and need to be tested as such too)
- Please provide a null-merge-to-5.6 branch too.

review: Needs Information
Revision history for this message
Alexey Bychko (abychko) wrote :

-param build http://jenkins.percona.com/job/percona-server-5.5-param/1001/

Revision history for this message
Alexey Bychko (abychko) wrote :

null merge for 5.6 https://code.launchpad.net/~abychko/percona-server/percona-server-56-BLD-80/+merge/221038

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'UDF/Makefile.am'
--- UDF/Makefile.am 2014-02-19 12:33:29 +0000
+++ UDF/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1ACLOCAL_AMFLAGS = -I m4
2
3SUBDIRS = src
40
=== removed file 'UDF/configure.ac'
--- UDF/configure.ac 2014-03-12 22:21:56 +0000
+++ UDF/configure.ac 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
1AC_INIT([pt-udf], [0.1], [https://bugs.launchpad.net/percona-toolkit])
2AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
3AC_CONFIG_MACRO_DIR([m4])
4LT INIT
5AC_PROG_LIBTOOL
6AC_PROG_CC
7AC_PROG_CXX
8AC_CONFIG_HEADERS([config.h])
9AC_CONFIG_FILES([Makefile src/Makefile])
10AC_OUTPUT
110
=== removed directory 'UDF/m4'
=== removed directory 'UDF/src'
=== removed file 'UDF/src/Makefile.am'
--- UDF/src/Makefile.am 2013-05-27 13:46:13 +0000
+++ UDF/src/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1lib_LTLIBRARIES = libfnv1a_udf.la libfnv_udf.la libmurmur_udf.la
2libfnv1a_udf_la_SOURCES = fnv1a_udf.cc
3libfnv_udf_la_SOURCES = fnv_udf.cc
4libmurmur_udf_la_SOURCES = murmur_udf.cc
5libfnv1a_udf_la_CPPFLAGS = -I$(includedir)
6libfnv_udf_la_CPPFLAGS = -I$(includedir)
7libmurmur_udf_la_CPPFLAGS = -I$(includedir)
80
=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh 2014-04-18 04:06:52 +0000
+++ build-ps/build-binary.sh 2014-05-26 09:06:56 +0000
@@ -202,7 +202,7 @@
202202
203 # Build HandlerSocket203 # Build HandlerSocket
204 (204 (
205 cd "storage/HandlerSocket-Plugin-for-MySQL"205 cd "plugin/HandlerSocket-Plugin-for-MySQL"
206 ./autogen.sh206 ./autogen.sh
207 CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$SOURCEDIR" \207 CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$SOURCEDIR" \
208 --with-mysql-bindir="$SOURCEDIR/scripts" \208 --with-mysql-bindir="$SOURCEDIR/scripts" \
209209
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules 2014-03-31 05:35:44 +0000
+++ build-ps/debian/rules 2014-05-26 09:06:56 +0000
@@ -146,7 +146,7 @@
146 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)146 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
147 147
148 # build HandlerSocket148 # build HandlerSocket
149 (cd storage/HandlerSocket-Plugin-for-MySQL && \149 (cd plugin/HandlerSocket-Plugin-for-MySQL && ./autogen.sh; \
150 MYSQL_CFLAGS="-I$(CURDIR)/$(builddir)/include" \150 MYSQL_CFLAGS="-I$(CURDIR)/$(builddir)/include" \
151 ./configure --with-mysql-source=$(CURDIR) \151 ./configure --with-mysql-source=$(CURDIR) \
152 --with-mysql-bindir=$(CURDIR)/$(builddir)/scripts \152 --with-mysql-bindir=$(CURDIR)/$(builddir)/scripts \
@@ -154,13 +154,6 @@
154 --libdir=$(prefix)/lib --prefix=$(prefix) && \154 --libdir=$(prefix)/lib --prefix=$(prefix) && \
155 make && make DESTDIR=$(TMP) install)155 make && make DESTDIR=$(TMP) install)
156156
157 # Build UDFs
158 (cd UDF && \
159 CXXFLAGS="-I $(CURDIR)/$(builddir)/include" \
160 ./configure --includedir=$(CURDIR)/include \
161 --libdir=$(prefix)/lib/mysql/plugin && \
162 make && make DESTDIR=$(TMP) install)
163
164 # After installing, remove rpath to make lintian happy.157 # After installing, remove rpath to make lintian happy.
165 set +e; \158 set +e; \
166 find ./debian/tmp/ -type f -print0 \159 find ./debian/tmp/ -type f -print0 \
167160
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec 2014-04-26 13:57:29 +0000
+++ build-ps/percona-server.spec 2014-05-26 09:06:56 +0000
@@ -335,8 +335,9 @@
335set -uex335set -uex
336336
337BuildHandlerSocket() {337BuildHandlerSocket() {
338 cd storage/HandlerSocket-Plugin-for-MySQL338 cd plugin/HandlerSocket-Plugin-for-MySQL
339 echo "Configuring HandlerSocket"339 echo "Configuring HandlerSocket"
340 ./autogen.sh
340 CXX="${HS_CXX:-g++}" \341 CXX="${HS_CXX:-g++}" \
341 MYSQL_CFLAGS="-I $RPM_BUILD_DIR/%{src_dir}/release/include" \342 MYSQL_CFLAGS="-I $RPM_BUILD_DIR/%{src_dir}/release/include" \
342 ./configure --with-mysql-source=$RPM_BUILD_DIR/%{src_dir} \343 ./configure --with-mysql-source=$RPM_BUILD_DIR/%{src_dir} \
@@ -348,16 +349,6 @@
348 cd -349 cd -
349}350}
350351
351BuildUDF() {
352 cd UDF
353 CXX="${UDF_CXX:-g++}"\
354 CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \
355 ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include \
356 --libdir=%{_libdir}/mysql/plugin
357 make %{?_smp_mflags} all
358 cd -
359}
360
361# Optional package files352# Optional package files
362touch optional-files-devel353touch optional-files-devel
363354
@@ -446,7 +437,6 @@
446 cd ../437 cd ../
447 d="`pwd`"438 d="`pwd`"
448 BuildHandlerSocket439 BuildHandlerSocket
449 BuildUDF
450 cd "$d"440 cd "$d"
451)441)
452442
@@ -488,10 +478,7 @@
488 cd $MBD/release478 cd $MBD/release
489 make DESTDIR=$RBR benchdir_root=%{_datadir} install479 make DESTDIR=$RBR benchdir_root=%{_datadir} install
490 d="`pwd`"480 d="`pwd`"
491 cd $MBD/storage/HandlerSocket-Plugin-for-MySQL481 cd $MBD/plugin/HandlerSocket-Plugin-for-MySQL
492 make DESTDIR=$RBR benchdir_root=%{_datadir} install
493 cd "$d"
494 cd $MBD/UDF
495 make DESTDIR=$RBR benchdir_root=%{_datadir} install482 make DESTDIR=$RBR benchdir_root=%{_datadir} install
496 cd "$d"483 cd "$d"
497)484)
@@ -1047,14 +1034,13 @@
1047%attr(755, root, root) %{_libdir}/mysql/plugin/handlersocket.so.0.0.01034%attr(755, root, root) %{_libdir}/mysql/plugin/handlersocket.so.0.0.0
1048# UDF files1035# UDF files
1049%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so1036%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so
1050%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0
1051%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0.0.0
1052%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so1037%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so
1053%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0
1054%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0.0.0
1055%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so1038%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so
1056%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.01039# debug
1057%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0.0.01040%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv1a_udf.so
1041%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv_udf.so
1042%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmurmur_udf.so
1043
1058# Audit Log and Scalability Metrics files1044# Audit Log and Scalability Metrics files
1059%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so1045%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
1060%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so1046%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
@@ -1122,14 +1108,6 @@
1122%{_libdir}/mysql/libhsclient.a1108%{_libdir}/mysql/libhsclient.a
1123%{_libdir}/libhsclient.la1109%{_libdir}/libhsclient.la
11241110
1125# Percona Toolkit UDF libs
1126%{_libdir}/mysql/plugin/libfnv1a_udf.a
1127%{_libdir}/mysql/plugin/libfnv1a_udf.la
1128%{_libdir}/mysql/plugin/libfnv_udf.a
1129%{_libdir}/mysql/plugin/libfnv_udf.la
1130%{_libdir}/mysql/plugin/libmurmur_udf.a
1131%{_libdir}/mysql/plugin/libmurmur_udf.la
1132
1133# ----------------------------------------------------------------------------1111# ----------------------------------------------------------------------------
1134%files -n Percona-Server-shared%{product_suffix}1112%files -n Percona-Server-shared%{product_suffix}
1135%defattr(-, root, root, 0755)1113%defattr(-, root, root, 0755)
11361114
=== renamed directory 'storage/HandlerSocket-Plugin-for-MySQL' => 'plugin/HandlerSocket-Plugin-for-MySQL'
=== renamed directory 'UDF' => 'plugin/percona-udf'
=== added file 'plugin/percona-udf/CMakeLists.txt'
--- plugin/percona-udf/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ plugin/percona-udf/CMakeLists.txt 2014-05-26 09:06:56 +0000
@@ -0,0 +1,3 @@
1MYSQL_ADD_PLUGIN(libfnv1a_udf fnv1a_udf.cc MODULE_ONLY)
2MYSQL_ADD_PLUGIN(libfnv_udf fnv_udf.cc MODULE_ONLY)
3MYSQL_ADD_PLUGIN(libmurmur_udf murmur_udf.cc MODULE_ONLY)
04
=== renamed file 'UDF/src/fnv1a_udf.cc' => 'plugin/percona-udf/fnv1a_udf.cc'
=== renamed file 'UDF/src/fnv_udf.cc' => 'plugin/percona-udf/fnv_udf.cc'
=== renamed file 'UDF/src/murmur_udf.cc' => 'plugin/percona-udf/murmur_udf.cc'

Subscribers

People subscribed via source and target branches