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

Merge lp:~percona-core/percona-server/release-5.5.30-30.2 into lp:percona-server/5.5

  1. release-5.5.30-30.2
  2. Merge into 5.5
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 501
Merged at revision: 502
Proposed branch: lp:~percona-core/percona-server/release-5.5.30-30.2
Merge into: lp:percona-server/5.5
Diff against target: 82 lines (+8/-3)
4 files modified
Makefile (+1/-1)
build/build-binary.sh (+1/-0)
build/debian/rules (+3/-1)
build/percona-server.spec (+3/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.30-30.2
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+158492@code.launchpad.net

Description of the change

Changes for release 5.5.30-30.2.

Resubmit after fixing a spurious change in an unrelated file.

To post a comment you must log in.
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'
2--- Makefile 2013-04-08 06:26:11 +0000
3+++ Makefile 2013-04-11 21:08:27 +0000
4@@ -1,7 +1,7 @@
5 FETCH_CMD=wget
6 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
7 MYSQL_VERSION=5.5.30
8-PERCONA_SERVER_VERSION=rel30.1
9+PERCONA_SERVER_VERSION=rel30.2
10 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
11 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
12 PERCONA_SERVER_SHORT_2 ?=Percona-Server
13
14=== modified file 'build/build-binary.sh'
15--- build/build-binary.sh 2013-03-22 06:37:13 +0000
16+++ build/build-binary.sh 2013-04-11 21:08:27 +0000
17@@ -149,6 +149,7 @@
18 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
19 -DWITH_EMBEDDED_SERVER=OFF \
20 -DFEATURE_SET=community \
21+ -DWITH_SSL=system \
22 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
23 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
24 -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
25
26=== modified file 'build/debian/rules'
27--- build/debian/rules 2013-04-08 06:26:11 +0000
28+++ build/debian/rules 2013-04-11 21:08:27 +0000
29@@ -9,7 +9,7 @@
30
31 feature_set="community"
32 major_version=30
33-minor_version=1
34+minor_version=2
35 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
36 server_suffix="-$(major_version).$(minor_version)"
37 prefix="/usr"
38@@ -28,6 +28,7 @@
39 $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
40 -DINSTALL_LAYOUT=DEB \
41 -DCMAKE_BUILD_TYPE=Debug \
42+ -DWITH_SSL=system \
43 -DWITH_EMBEDDED_SERVER=OFF \
44 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
45 -DFEATURE_SET=$(feature_set) \
46@@ -40,6 +41,7 @@
47 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
48 -DINSTALL_LAYOUT=DEB \
49 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
50+ -DWITH_SSL=system \
51 -DWITH_EMBEDDED_SERVER=OFF \
52 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
53 -DFEATURE_SET=$(feature_set) \
54
55=== modified file 'build/percona-server.spec'
56--- build/percona-server.spec 2013-04-09 21:37:02 +0000
57+++ build/percona-server.spec 2013-04-11 21:08:27 +0000
58@@ -28,7 +28,7 @@
59 %define mysql_version 5.5.30
60 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
61 %define majorversion 30
62-%define minorversion 1
63+%define minorversion 2
64 %define distribution rhel%{redhatversion}
65 %define percona_server_version rel%{majorversion}.%{minorversion}
66
67@@ -408,6 +408,7 @@
68 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
69 -DCMAKE_BUILD_TYPE=Debug \
70 -DWITH_EMBEDDED_SERVER=OFF \
71+ -DWITH_SSL=system \
72 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
73 -DFEATURE_SET="%{feature_set}" \
74 -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
75@@ -425,6 +426,7 @@
76 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
77 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
78 -DWITH_EMBEDDED_SERVER=OFF \
79+ -DWITH_SSL=system \
80 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
81 -DFEATURE_SET="%{feature_set}" \
82 -DCOMPILATION_COMMENT="%{compilation_comment_release}" \

Subscribers

People subscribed via source and target branches