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

Proposed by Alexey Bychko on 2014-05-26
Status: Merged
Approved by: Laurynas Biveinis on 2014-05-28
Approved revision: 662
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) 2014-05-26 Approve on 2014-05-28
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.

- 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
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'UDF/Makefile.am'
2--- UDF/Makefile.am 2014-02-19 12:33:29 +0000
3+++ UDF/Makefile.am 1970-01-01 00:00:00 +0000
4@@ -1,3 +0,0 @@
5-ACLOCAL_AMFLAGS = -I m4
6-
7-SUBDIRS = src
8
9=== removed file 'UDF/configure.ac'
10--- UDF/configure.ac 2014-03-12 22:21:56 +0000
11+++ UDF/configure.ac 1970-01-01 00:00:00 +0000
12@@ -1,10 +0,0 @@
13-AC_INIT([pt-udf], [0.1], [https://bugs.launchpad.net/percona-toolkit])
14-AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
15-AC_CONFIG_MACRO_DIR([m4])
16-LT INIT
17-AC_PROG_LIBTOOL
18-AC_PROG_CC
19-AC_PROG_CXX
20-AC_CONFIG_HEADERS([config.h])
21-AC_CONFIG_FILES([Makefile src/Makefile])
22-AC_OUTPUT
23
24=== removed directory 'UDF/m4'
25=== removed directory 'UDF/src'
26=== removed file 'UDF/src/Makefile.am'
27--- UDF/src/Makefile.am 2013-05-27 13:46:13 +0000
28+++ UDF/src/Makefile.am 1970-01-01 00:00:00 +0000
29@@ -1,7 +0,0 @@
30-lib_LTLIBRARIES = libfnv1a_udf.la libfnv_udf.la libmurmur_udf.la
31-libfnv1a_udf_la_SOURCES = fnv1a_udf.cc
32-libfnv_udf_la_SOURCES = fnv_udf.cc
33-libmurmur_udf_la_SOURCES = murmur_udf.cc
34-libfnv1a_udf_la_CPPFLAGS = -I$(includedir)
35-libfnv_udf_la_CPPFLAGS = -I$(includedir)
36-libmurmur_udf_la_CPPFLAGS = -I$(includedir)
37
38=== modified file 'build-ps/build-binary.sh'
39--- build-ps/build-binary.sh 2014-04-18 04:06:52 +0000
40+++ build-ps/build-binary.sh 2014-05-26 09:06:56 +0000
41@@ -202,7 +202,7 @@
42
43 # Build HandlerSocket
44 (
45- cd "storage/HandlerSocket-Plugin-for-MySQL"
46+ cd "plugin/HandlerSocket-Plugin-for-MySQL"
47 ./autogen.sh
48 CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$SOURCEDIR" \
49 --with-mysql-bindir="$SOURCEDIR/scripts" \
50
51=== modified file 'build-ps/debian/rules'
52--- build-ps/debian/rules 2014-03-31 05:35:44 +0000
53+++ build-ps/debian/rules 2014-05-26 09:06:56 +0000
54@@ -146,7 +146,7 @@
55 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
56
57 # build HandlerSocket
58- (cd storage/HandlerSocket-Plugin-for-MySQL && \
59+ (cd plugin/HandlerSocket-Plugin-for-MySQL && ./autogen.sh; \
60 MYSQL_CFLAGS="-I$(CURDIR)/$(builddir)/include" \
61 ./configure --with-mysql-source=$(CURDIR) \
62 --with-mysql-bindir=$(CURDIR)/$(builddir)/scripts \
63@@ -154,13 +154,6 @@
64 --libdir=$(prefix)/lib --prefix=$(prefix) && \
65 make && make DESTDIR=$(TMP) install)
66
67- # Build UDFs
68- (cd UDF && \
69- CXXFLAGS="-I $(CURDIR)/$(builddir)/include" \
70- ./configure --includedir=$(CURDIR)/include \
71- --libdir=$(prefix)/lib/mysql/plugin && \
72- make && make DESTDIR=$(TMP) install)
73-
74 # After installing, remove rpath to make lintian happy.
75 set +e; \
76 find ./debian/tmp/ -type f -print0 \
77
78=== modified file 'build-ps/percona-server.spec'
79--- build-ps/percona-server.spec 2014-04-26 13:57:29 +0000
80+++ build-ps/percona-server.spec 2014-05-26 09:06:56 +0000
81@@ -335,8 +335,9 @@
82 set -uex
83
84 BuildHandlerSocket() {
85- cd storage/HandlerSocket-Plugin-for-MySQL
86+ cd plugin/HandlerSocket-Plugin-for-MySQL
87 echo "Configuring HandlerSocket"
88+ ./autogen.sh
89 CXX="${HS_CXX:-g++}" \
90 MYSQL_CFLAGS="-I $RPM_BUILD_DIR/%{src_dir}/release/include" \
91 ./configure --with-mysql-source=$RPM_BUILD_DIR/%{src_dir} \
92@@ -348,16 +349,6 @@
93 cd -
94 }
95
96-BuildUDF() {
97- cd UDF
98- CXX="${UDF_CXX:-g++}"\
99- CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \
100- ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include \
101- --libdir=%{_libdir}/mysql/plugin
102- make %{?_smp_mflags} all
103- cd -
104-}
105-
106 # Optional package files
107 touch optional-files-devel
108
109@@ -446,7 +437,6 @@
110 cd ../
111 d="`pwd`"
112 BuildHandlerSocket
113- BuildUDF
114 cd "$d"
115 )
116
117@@ -488,10 +478,7 @@
118 cd $MBD/release
119 make DESTDIR=$RBR benchdir_root=%{_datadir} install
120 d="`pwd`"
121- cd $MBD/storage/HandlerSocket-Plugin-for-MySQL
122- make DESTDIR=$RBR benchdir_root=%{_datadir} install
123- cd "$d"
124- cd $MBD/UDF
125+ cd $MBD/plugin/HandlerSocket-Plugin-for-MySQL
126 make DESTDIR=$RBR benchdir_root=%{_datadir} install
127 cd "$d"
128 )
129@@ -1047,14 +1034,13 @@
130 %attr(755, root, root) %{_libdir}/mysql/plugin/handlersocket.so.0.0.0
131 # UDF files
132 %attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so
133-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0
134-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0.0.0
135 %attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so
136-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0
137-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0.0.0
138 %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so
139-%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0
140-%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0.0.0
141+# debug
142+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv1a_udf.so
143+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libfnv_udf.so
144+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libmurmur_udf.so
145+
146 # Audit Log and Scalability Metrics files
147 %attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
148 %attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
149@@ -1122,14 +1108,6 @@
150 %{_libdir}/mysql/libhsclient.a
151 %{_libdir}/libhsclient.la
152
153-# Percona Toolkit UDF libs
154-%{_libdir}/mysql/plugin/libfnv1a_udf.a
155-%{_libdir}/mysql/plugin/libfnv1a_udf.la
156-%{_libdir}/mysql/plugin/libfnv_udf.a
157-%{_libdir}/mysql/plugin/libfnv_udf.la
158-%{_libdir}/mysql/plugin/libmurmur_udf.a
159-%{_libdir}/mysql/plugin/libmurmur_udf.la
160-
161 # ----------------------------------------------------------------------------
162 %files -n Percona-Server-shared%{product_suffix}
163 %defattr(-, root, root, 0755)
164
165=== renamed directory 'storage/HandlerSocket-Plugin-for-MySQL' => 'plugin/HandlerSocket-Plugin-for-MySQL'
166=== renamed directory 'UDF' => 'plugin/percona-udf'
167=== added file 'plugin/percona-udf/CMakeLists.txt'
168--- plugin/percona-udf/CMakeLists.txt 1970-01-01 00:00:00 +0000
169+++ plugin/percona-udf/CMakeLists.txt 2014-05-26 09:06:56 +0000
170@@ -0,0 +1,3 @@
171+MYSQL_ADD_PLUGIN(libfnv1a_udf fnv1a_udf.cc MODULE_ONLY)
172+MYSQL_ADD_PLUGIN(libfnv_udf fnv_udf.cc MODULE_ONLY)
173+MYSQL_ADD_PLUGIN(libmurmur_udf murmur_udf.cc MODULE_ONLY)
174
175=== renamed file 'UDF/src/fnv1a_udf.cc' => 'plugin/percona-udf/fnv1a_udf.cc'
176=== renamed file 'UDF/src/fnv_udf.cc' => 'plugin/percona-udf/fnv_udf.cc'
177=== renamed file 'UDF/src/murmur_udf.cc' => 'plugin/percona-udf/murmur_udf.cc'

Subscribers

People subscribed via source and target branches