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

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

  1. 5.5-bug1104977
  2. Merge into 5.5
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
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.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

Looks good, leaving as WiP until 5.1 is resolved.

review: Approve
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

Any reason not to this for 5.6 as well?

Revision history for this message
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.

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

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
=== modified file 'build/build-binary.sh'
--- build/build-binary.sh 2013-03-22 06:37:13 +0000
+++ build/build-binary.sh 2013-03-26 15:18:24 +0000
@@ -149,6 +149,7 @@
149 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \149 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
150 -DWITH_EMBEDDED_SERVER=OFF \150 -DWITH_EMBEDDED_SERVER=OFF \
151 -DFEATURE_SET=community \151 -DFEATURE_SET=community \
152 -DWITH_SSL=system \
152 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \153 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
153 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \154 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
154 -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \155 -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
155156
=== modified file 'build/debian/rules'
--- build/debian/rules 2013-03-13 07:36:26 +0000
+++ build/debian/rules 2013-03-26 15:18:24 +0000
@@ -28,6 +28,7 @@
28 $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \28 $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
29 -DINSTALL_LAYOUT=DEB \29 -DINSTALL_LAYOUT=DEB \
30 -DCMAKE_BUILD_TYPE=Debug \30 -DCMAKE_BUILD_TYPE=Debug \
31 -DWITH_SSL=system \
31 -DWITH_EMBEDDED_SERVER=OFF \32 -DWITH_EMBEDDED_SERVER=OFF \
32 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \33 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
33 -DFEATURE_SET=$(feature_set) \34 -DFEATURE_SET=$(feature_set) \
@@ -40,6 +41,7 @@
40 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \41 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
41 -DINSTALL_LAYOUT=DEB \42 -DINSTALL_LAYOUT=DEB \
42 -DCMAKE_BUILD_TYPE=RelWithDebInfo \43 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
44 -DWITH_SSL=system \
43 -DWITH_EMBEDDED_SERVER=OFF \45 -DWITH_EMBEDDED_SERVER=OFF \
44 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \46 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
45 -DFEATURE_SET=$(feature_set) \47 -DFEATURE_SET=$(feature_set) \
4648
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-03-26 07:16:53 +0000
+++ build/percona-server.spec 2013-03-26 15:18:24 +0000
@@ -413,6 +413,7 @@
413 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \413 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
414 -DCMAKE_BUILD_TYPE=Debug \414 -DCMAKE_BUILD_TYPE=Debug \
415 -DWITH_EMBEDDED_SERVER=OFF \415 -DWITH_EMBEDDED_SERVER=OFF \
416 -DWITH_SSL=system \
416 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \417 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
417 -DFEATURE_SET="%{feature_set}" \418 -DFEATURE_SET="%{feature_set}" \
418 -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \419 -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -430,6 +431,7 @@
430 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \431 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
431 -DCMAKE_BUILD_TYPE=RelWithDebInfo \432 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
432 -DWITH_EMBEDDED_SERVER=OFF \433 -DWITH_EMBEDDED_SERVER=OFF \
434 -DWITH_SSL=system \
433 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \435 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
434 -DFEATURE_SET="%{feature_set}" \436 -DFEATURE_SET="%{feature_set}" \
435 -DCOMPILATION_COMMENT="%{compilation_comment_release}" \437 -DCOMPILATION_COMMENT="%{compilation_comment_release}" \

Subscribers

People subscribed via source and target branches