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

Proposed by Tomislav Plavcic
Status: Superseded
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
Registry Administrators Pending
Review via email: mp+211462@code.launchpad.net

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

Description of the change

Release branch for PS version 5.5.36-34.1

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile-ps'
--- Makefile-ps 2014-02-19 14:14:52 +0000
+++ Makefile-ps 2014-03-25 13:09:09 +0000
@@ -1,5 +1,5 @@
1MYSQL_VERSION=5.5.361MYSQL_VERSION=5.5.36
2PERCONA_SERVER_VERSION=rel34.02PERCONA_SERVER_VERSION=rel34.2
3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
5PERCONA_SERVER_SHORT_2 ?=Percona-Server5PERCONA_SERVER_SHORT_2 ?=Percona-Server
66
=== modified file 'VERSION'
--- VERSION 2014-02-03 04:39:37 +0000
+++ VERSION 2014-03-25 13:09:09 +0000
@@ -1,4 +1,4 @@
1MYSQL_VERSION_MAJOR=51MYSQL_VERSION_MAJOR=5
2MYSQL_VERSION_MINOR=52MYSQL_VERSION_MINOR=5
3MYSQL_VERSION_PATCH=363MYSQL_VERSION_PATCH=36
4MYSQL_VERSION_EXTRA=-34.04MYSQL_VERSION_EXTRA=-34.2
55
=== modified file 'build-ps/debian/control'
--- build-ps/debian/control 2014-02-28 14:49:39 +0000
+++ build-ps/debian/control 2014-03-25 13:09:09 +0000
@@ -88,7 +88,7 @@
88Package: percona-server-common-5.588Package: percona-server-common-5.5
89Section: database89Section: database
90Architecture: any90Architecture: any
91Depends: mysql-common, ${misc:Depends}91Depends: ${misc:Depends}
92Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)92Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
93 Percona Server is a fast, stable and true multi-user, multi-threaded SQL93 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
94 database server. SQL (Structured Query Language) is the most popular database94 database server. SQL (Structured Query Language) is the most popular database
9595
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules 2014-02-19 12:33:29 +0000
+++ build-ps/debian/rules 2014-03-25 13:09:09 +0000
@@ -7,6 +7,7 @@
7PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")7PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")
88
9TMP=$(CURDIR)/debian/tmp/9TMP=$(CURDIR)/debian/tmp/
10prefix=/usr
1011
11ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)12ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
12ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)13ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
@@ -143,7 +144,23 @@
143144
144 # make install (trailing slash needed for innobase)145 # make install (trailing slash needed for innobase)
145 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)146 (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
146 147
148 # build HandlerSocket
149 (cd storage/HandlerSocket-Plugin-for-MySQL && \
150 MYSQL_CFLAGS="-I$(CURDIR)/$(builddir)/include" \
151 ./configure --with-mysql-source=$(CURDIR) \
152 --with-mysql-bindir=$(CURDIR)/$(builddir)/scripts \
153 --with-mysql-plugindir=$(prefix)/lib/mysql/plugin \
154 --libdir=$(prefix)/lib --prefix=$(prefix) && \
155 make && make DESTDIR=$(TMP) install)
156
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
147 # After installing, remove rpath to make lintian happy.164 # After installing, remove rpath to make lintian happy.
148 set +e; \165 set +e; \
149 find ./debian/tmp/ -type f -print0 \166 find ./debian/tmp/ -type f -print0 \
@@ -187,10 +204,10 @@
187 # mysql-server204 # mysql-server
188 mkdir -p $(TMP)/usr/share/doc/percona-server-5.5/examples205 mkdir -p $(TMP)/usr/share/doc/percona-server-5.5/examples
189 mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/percona-server-5.5/examples/206 mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/percona-server-5.5/examples/
190 rm -vf $(TMP)/usr/share/percona-server/mi_test_all* \207 rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
191 $(TMP)/usr/share/percona-server/mysql-log-rotate \208 $(TMP)/usr/share/mysql/mysql-log-rotate \
192 $(TMP)/usr/share/percona-server/mysql.server \209 $(TMP)/usr/share/mysql/mysql.server \
193 $(TMP)/usr/share/percona-server/binary-configure210 $(TMP)/usr/share/mysql/binary-configure
194 nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.5/mysqld.sym.gz211 nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.5/mysqld.sym.gz
195 # FIXME install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/212 # FIXME install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
196 install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/213 install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
@@ -207,7 +224,6 @@
207 chmod -x $(TMP)/usr/share/mysql/config.medium.ini224 chmod -x $(TMP)/usr/share/mysql/config.medium.ini
208 chmod -x $(TMP)/usr/share/mysql/ndb-config-2-node.ini225 chmod -x $(TMP)/usr/share/mysql/ndb-config-2-node.ini
209 chmod -x $(TMP)/usr/share/mysql/config.huge.ini226 chmod -x $(TMP)/usr/share/mysql/config.huge.ini
210 chmod -x $(TMP)/usr/share/mysql/mysql-log-rotate
211 chmod -x $(TMP)/usr/share/mysql/config.small.ini227 chmod -x $(TMP)/usr/share/mysql/config.small.ini
212228
213 dh_movefiles229 dh_movefiles
@@ -276,8 +292,6 @@
276292
277override_dh_auto_install:293override_dh_auto_install:
278 dh_auto_install294 dh_auto_install
279 cd storage/HandlerSocket-Plugin-for-MySQL && make DESTDIR=$(TMP) install
280 cd UDF && make DESTDIR=$(TMP) install
281295
282.PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch296.PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch
283297
284298
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec 2014-02-28 14:49:39 +0000
+++ build-ps/percona-server.spec 2014-03-25 13:09:09 +0000
@@ -311,7 +311,12 @@
311%package -n Percona-Server-shared%{product_suffix}311%package -n Percona-Server-shared%{product_suffix}
312Summary: Percona Server - Shared libraries312Summary: Percona Server - Shared libraries
313Group: Applications/Databases313Group: Applications/Databases
314Provides: mysql-shared mysql-libs314%ifarch x86_64
315Provides: libmysqlclient.so.18()(64bit)
316%endif
317%ifarch i386 i686
318Provides: libmysqlclient.so.18()(32bit)
319%endif
315320
316%description -n Percona-Server-shared%{product_suffix}321%description -n Percona-Server-shared%{product_suffix}
317This package contains the shared libraries (*.so*) which certain languages322This package contains the shared libraries (*.so*) which certain languages
@@ -1130,6 +1135,13 @@
1130%{_libdir}/libperconaserver*.so*1135%{_libdir}/libperconaserver*.so*
11311136
1132%post -n Percona-Server-shared%{product_suffix}1137%post -n Percona-Server-shared%{product_suffix}
1138# Added for compatibility
1139for lib in libmysqlclient{.so.18.0.0,.so.18,_r.so.18.0.0,_r.so.18}; do
1140if [ ! -f %{_libdir}/$lib ]; then
1141 ln -s libperconaserverclient.so.18 %{_libdir}/$lib;
1142fi
1143done
1144
1133/sbin/ldconfig1145/sbin/ldconfig
11341146
1135%postun -n Percona-Server-shared%{product_suffix}1147%postun -n Percona-Server-shared%{product_suffix}
11361148
=== modified file 'scripts/mysql_install_db.pl.in'
--- scripts/mysql_install_db.pl.in 2014-01-06 05:22:35 +0000
+++ scripts/mysql_install_db.pl.in 2014-03-25 13:09:09 +0000
@@ -318,7 +318,7 @@
318 find_in_basedir($opt,"file","mysqld-nt",318 find_in_basedir($opt,"file","mysqld-nt",
319 "bin"); # ,"sql"319 "bin"); # ,"sql"
320 $pkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",320 $pkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",
321 "share","share/mysql"); # ,"scripts"321 "share","share/percona-server","share/mysql"); # ,"scripts"
322 $scriptdir = "$opt->{basedir}/scripts";322 $scriptdir = "$opt->{basedir}/scripts";
323}323}
324else324else
325325
=== modified file 'scripts/mysql_install_db.sh'
--- scripts/mysql_install_db.sh 2014-02-03 04:39:37 +0000
+++ scripts/mysql_install_db.sh 2014-03-25 13:09:09 +0000
@@ -269,16 +269,16 @@
269 cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin269 cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
270 exit 1270 exit 1
271 fi271 fi
272 langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`272 langdir=`find_in_basedir --dir errmsg.sys share/english share/percona-server/english share/mysql/english`
273 if test -z "$langdir"273 if test -z "$langdir"
274 then274 then
275 cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english275 cannot_find_file errmsg.sys $basedir/share/english $basedir/share/percona-server/english $basedir/share/mysql/english
276 exit 1276 exit 1
277 fi277 fi
278 pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`278 pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/percona-server share/mysql`
279 if test -z "$pkgdatadir"279 if test -z "$pkgdatadir"
280 then280 then
281 cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql281 cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/percona-server $basedir/share/mysql
282 exit 1282 exit 1
283 fi283 fi
284 scriptdir="$basedir/scripts"284 scriptdir="$basedir/scripts"
285285
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i 2014-02-27 07:48:21 +0000
+++ storage/innobase/include/univ.i 2014-03-25 13:09:09 +0000
@@ -64,7 +64,7 @@
64 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)64 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
6565
66#ifndef PERCONA_INNODB_VERSION66#ifndef PERCONA_INNODB_VERSION
67#define PERCONA_INNODB_VERSION 34.067#define PERCONA_INNODB_VERSION 34.2
68#endif68#endif
6969
70#define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)70#define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)

Subscribers

People subscribed via source and target branches