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

Merge lp:~percona-core/percona-server/release-5.6.16-64.1 into lp:percona-server/5.6

  1. release-5.6.16-64.1
  2. Merge into 5.6
Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 568
Proposed branch: lp:~percona-core/percona-server/release-5.6.16-64.1
Merge into: lp:percona-server/5.6
Diff against target: 182 lines (+34/-18)
8 files modified
Makefile-ps (+1/-1)
VERSION (+1/-1)
build-ps/debian/control (+1/-2)
build-ps/debian/rules (+12/-8)
build-ps/percona-server.spec (+13/-0)
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.6.16-64.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+212816@code.launchpad.net

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

Description of the change

Release branch for PS version 5.6.16-64.1 and 5.6.16-64.2

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

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

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

Subscribers

People subscribed via source and target branches

to all changes: