Merge lp:~percona-core/percona-server/release-5.5.36-34.1 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-03-26
Status: Merged
Approved by: Laurynas Biveinis on 2014-03-27
Approved revision: 648
Merged at revision: 646
Proposed branch: lp:~percona-core/percona-server/release-5.5.36-34.1
Merge into: lp:percona-server/5.5
Diff against target: 185 lines (+44/-18)
8 files modified
Makefile-ps (+1/-1)
VERSION (+1/-1)
build-ps/debian/control (+1/-1)
build-ps/debian/rules (+22/-8)
build-ps/percona-server.spec (+13/-1)
scripts/mysql_install_db.pl.in (+1/-1)
scripts/mysql_install_db.sh (+4/-4)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.36-34.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis 2014-03-26 Approve on 2014-03-27
Review via email: mp+212953@code.launchpad.net

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

Description of the change

Release branch for PS version 5.5.36-34.1 and 5.5.36-34.2

To post a comment you must log in.
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Let's hold this until any possible DEB/RPM respins

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile-ps'
2--- Makefile-ps 2014-02-19 14:14:52 +0000
3+++ Makefile-ps 2014-03-26 21:14:43 +0000
4@@ -1,5 +1,5 @@
5 MYSQL_VERSION=5.5.36
6-PERCONA_SERVER_VERSION=rel34.0
7+PERCONA_SERVER_VERSION=rel34.2
8 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
9 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
10 PERCONA_SERVER_SHORT_2 ?=Percona-Server
11
12=== modified file 'VERSION'
13--- VERSION 2014-02-03 04:39:37 +0000
14+++ VERSION 2014-03-26 21:14:43 +0000
15@@ -1,4 +1,4 @@
16 MYSQL_VERSION_MAJOR=5
17 MYSQL_VERSION_MINOR=5
18 MYSQL_VERSION_PATCH=36
19-MYSQL_VERSION_EXTRA=-34.0
20+MYSQL_VERSION_EXTRA=-34.2
21
22=== modified file 'build-ps/debian/control'
23--- build-ps/debian/control 2014-02-28 14:49:39 +0000
24+++ build-ps/debian/control 2014-03-26 21:14:43 +0000
25@@ -88,7 +88,7 @@
26 Package: percona-server-common-5.5
27 Section: database
28 Architecture: any
29-Depends: mysql-common, ${misc:Depends}
30+Depends: ${misc:Depends}
31 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
32 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
33 database server. SQL (Structured Query Language) is the most popular database
34
35=== modified file 'build-ps/debian/rules'
36--- build-ps/debian/rules 2014-02-19 12:33:29 +0000
37+++ build-ps/debian/rules 2014-03-26 21:14:43 +0000
38@@ -7,6 +7,7 @@
39 PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")
40
41 TMP=$(CURDIR)/debian/tmp/
42+prefix=/usr
43
44 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
45 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
46@@ -143,7 +144,23 @@
47
48 # make install (trailing slash needed for innobase)
49 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
50-
51+
52+ # build HandlerSocket
53+ (cd storage/HandlerSocket-Plugin-for-MySQL && \
54+ MYSQL_CFLAGS="-I$(CURDIR)/$(builddir)/include" \
55+ ./configure --with-mysql-source=$(CURDIR) \
56+ --with-mysql-bindir=$(CURDIR)/$(builddir)/scripts \
57+ --with-mysql-plugindir=$(prefix)/lib/mysql/plugin \
58+ --libdir=$(prefix)/lib --prefix=$(prefix) && \
59+ make && make DESTDIR=$(TMP) install)
60+
61+ # Build UDFs
62+ (cd UDF && \
63+ CXXFLAGS="-I $(CURDIR)/$(builddir)/include" \
64+ ./configure --includedir=$(CURDIR)/include \
65+ --libdir=$(prefix)/lib/mysql/plugin && \
66+ make && make DESTDIR=$(TMP) install)
67+
68 # After installing, remove rpath to make lintian happy.
69 set +e; \
70 find ./debian/tmp/ -type f -print0 \
71@@ -187,10 +204,10 @@
72 # mysql-server
73 mkdir -p $(TMP)/usr/share/doc/percona-server-5.5/examples
74 mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/percona-server-5.5/examples/
75- rm -vf $(TMP)/usr/share/percona-server/mi_test_all* \
76- $(TMP)/usr/share/percona-server/mysql-log-rotate \
77- $(TMP)/usr/share/percona-server/mysql.server \
78- $(TMP)/usr/share/percona-server/binary-configure
79+ rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
80+ $(TMP)/usr/share/mysql/mysql-log-rotate \
81+ $(TMP)/usr/share/mysql/mysql.server \
82+ $(TMP)/usr/share/mysql/binary-configure
83 nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.5/mysqld.sym.gz
84 # FIXME install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
85 install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
86@@ -207,7 +224,6 @@
87 chmod -x $(TMP)/usr/share/mysql/config.medium.ini
88 chmod -x $(TMP)/usr/share/mysql/ndb-config-2-node.ini
89 chmod -x $(TMP)/usr/share/mysql/config.huge.ini
90- chmod -x $(TMP)/usr/share/mysql/mysql-log-rotate
91 chmod -x $(TMP)/usr/share/mysql/config.small.ini
92
93 dh_movefiles
94@@ -276,8 +292,6 @@
95
96 override_dh_auto_install:
97 dh_auto_install
98- cd storage/HandlerSocket-Plugin-for-MySQL && make DESTDIR=$(TMP) install
99- cd UDF && make DESTDIR=$(TMP) install
100
101 .PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch
102
103
104=== modified file 'build-ps/percona-server.spec'
105--- build-ps/percona-server.spec 2014-02-28 14:49:39 +0000
106+++ build-ps/percona-server.spec 2014-03-26 21:14:43 +0000
107@@ -311,7 +311,12 @@
108 %package -n Percona-Server-shared%{product_suffix}
109 Summary: Percona Server - Shared libraries
110 Group: Applications/Databases
111-Provides: mysql-shared mysql-libs
112+%ifarch x86_64
113+Provides: libmysqlclient.so.18()(64bit)
114+%endif
115+%ifarch i386 i686
116+Provides: libmysqlclient.so.18()(32bit)
117+%endif
118
119 %description -n Percona-Server-shared%{product_suffix}
120 This package contains the shared libraries (*.so*) which certain languages
121@@ -1130,6 +1135,13 @@
122 %{_libdir}/libperconaserver*.so*
123
124 %post -n Percona-Server-shared%{product_suffix}
125+# Added for compatibility
126+for lib in libmysqlclient{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do
127+if [ ! -f %{_libdir}/$lib ]; then
128+ ln -s libperconaserverclient.so.18 %{_libdir}/$lib;
129+fi
130+done
131+
132 /sbin/ldconfig
133
134 %postun -n Percona-Server-shared%{product_suffix}
135
136=== modified file 'scripts/mysql_install_db.pl.in'
137--- scripts/mysql_install_db.pl.in 2014-01-06 05:22:35 +0000
138+++ scripts/mysql_install_db.pl.in 2014-03-26 21:14:43 +0000
139@@ -318,7 +318,7 @@
140 find_in_basedir($opt,"file","mysqld-nt",
141 "bin"); # ,"sql"
142 $pkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",
143- "share","share/mysql"); # ,"scripts"
144+ "share","share/percona-server","share/mysql"); # ,"scripts"
145 $scriptdir = "$opt->{basedir}/scripts";
146 }
147 else
148
149=== modified file 'scripts/mysql_install_db.sh'
150--- scripts/mysql_install_db.sh 2014-02-03 04:39:37 +0000
151+++ scripts/mysql_install_db.sh 2014-03-26 21:14:43 +0000
152@@ -269,16 +269,16 @@
153 cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
154 exit 1
155 fi
156- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
157+ langdir=`find_in_basedir --dir errmsg.sys share/english share/percona-server/english share/mysql/english`
158 if test -z "$langdir"
159 then
160- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
161+ cannot_find_file errmsg.sys $basedir/share/english $basedir/share/percona-server/english $basedir/share/mysql/english
162 exit 1
163 fi
164- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
165+ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/percona-server share/mysql`
166 if test -z "$pkgdatadir"
167 then
168- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
169+ cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/percona-server $basedir/share/mysql
170 exit 1
171 fi
172 scriptdir="$basedir/scripts"
173
174=== modified file 'storage/innobase/include/univ.i'
175--- storage/innobase/include/univ.i 2014-02-27 07:48:21 +0000
176+++ storage/innobase/include/univ.i 2014-03-26 21:14:43 +0000
177@@ -64,7 +64,7 @@
178 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
179
180 #ifndef PERCONA_INNODB_VERSION
181-#define PERCONA_INNODB_VERSION 34.0
182+#define PERCONA_INNODB_VERSION 34.2
183 #endif
184
185 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)

Subscribers

People subscribed via source and target branches