Merge lp:~ignacio-nin/percona-server/5.5-bug1104977 into lp:percona-server/5.5

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 482
Merged at revision: 501
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1104977
Merge into: lp:percona-server/5.5
Diff against target: 51 lines (+5/-0)
3 files modified
build/build-binary.sh (+1/-0)
build/debian/rules (+2/-0)
build/percona-server.spec (+2/-0)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1104977
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+155520@code.launchpad.net
To post a comment you must log in.

Looks good, leaving as WiP until 5.1 is resolved.

review: Approve

Any reason not to this for 5.6 as well?

Ignacio Nin (ignacio-nin) wrote :

> Any reason not to this for 5.6 as well?

The bug wasn't confirmed for 5.6, but I'll look into it.

It doesn't make sense to hold this off because of GCA, because the GCA will have different 5.6 fileids and this patch looks like an automerge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/build-binary.sh'
2--- build/build-binary.sh 2013-03-22 06:37:13 +0000
3+++ build/build-binary.sh 2013-03-26 15:18:24 +0000
4@@ -149,6 +149,7 @@
5 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
6 -DWITH_EMBEDDED_SERVER=OFF \
7 -DFEATURE_SET=community \
8+ -DWITH_SSL=system \
9 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
10 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
11 -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
12
13=== modified file 'build/debian/rules'
14--- build/debian/rules 2013-03-13 07:36:26 +0000
15+++ build/debian/rules 2013-03-26 15:18:24 +0000
16@@ -28,6 +28,7 @@
17 $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
18 -DINSTALL_LAYOUT=DEB \
19 -DCMAKE_BUILD_TYPE=Debug \
20+ -DWITH_SSL=system \
21 -DWITH_EMBEDDED_SERVER=OFF \
22 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
23 -DFEATURE_SET=$(feature_set) \
24@@ -40,6 +41,7 @@
25 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
26 -DINSTALL_LAYOUT=DEB \
27 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
28+ -DWITH_SSL=system \
29 -DWITH_EMBEDDED_SERVER=OFF \
30 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
31 -DFEATURE_SET=$(feature_set) \
32
33=== modified file 'build/percona-server.spec'
34--- build/percona-server.spec 2013-03-26 07:16:53 +0000
35+++ build/percona-server.spec 2013-03-26 15:18:24 +0000
36@@ -413,6 +413,7 @@
37 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
38 -DCMAKE_BUILD_TYPE=Debug \
39 -DWITH_EMBEDDED_SERVER=OFF \
40+ -DWITH_SSL=system \
41 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
42 -DFEATURE_SET="%{feature_set}" \
43 -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
44@@ -430,6 +431,7 @@
45 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
46 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
47 -DWITH_EMBEDDED_SERVER=OFF \
48+ -DWITH_SSL=system \
49 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
50 -DFEATURE_SET="%{feature_set}" \
51 -DCOMPILATION_COMMENT="%{compilation_comment_release}" \

Subscribers

People subscribed via source and target branches