Percona XtraDB Cluster moved to https://jira.percona.com/projects/PXC

Merge lp:~raghavendra-prabhu/percona-xtradb-cluster/bug-1104977 into lp:~raghavendra-prabhu/percona-xtradb-cluster/release-5.5.30

  1. bug-1104977
  2. Merge into release-5.5.30
Proposed by Raghavendra D Prabhu
Status: Merged
Merge reported by: Raghavendra D Prabhu
Merged at revision: not available
Proposed branch: lp:~raghavendra-prabhu/percona-xtradb-cluster/bug-1104977
Merge into: lp:~raghavendra-prabhu/percona-xtradb-cluster/release-5.5.30
Diff against target: 77 lines (+7/-2)
5 files modified
build/build-binary.sh (+1/-0)
build/build-rpm.sh (+1/-1)
build/build-shared-compat-rpm.sh (+1/-1)
build/debian/rules (+2/-0)
build/percona-xtradb-cluster.spec (+2/-0)
To merge this branch: bzr merge lp:~raghavendra-prabhu/percona-xtradb-cluster/bug-1104977
Reviewer Review Type Date Requested Status
Raghavendra D Prabhu Pending
Review via email: mp+157413@code.launchpad.net
To post a comment you must log in.

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-21 11:44:07 +0000
+++ build/build-binary.sh 2013-04-05 15:43:03 +0000
@@ -163,6 +163,7 @@
163 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \163 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
164 -DWITH_EMBEDDED_SERVER=OFF \164 -DWITH_EMBEDDED_SERVER=OFF \
165 -DFEATURE_SET=community \165 -DFEATURE_SET=community \
166 -DWITH_SSL=system \
166 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \167 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
167 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \168 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
168 -DMYSQL_SERVER_SUFFIX="-$RELEASE_TAG$WSREP_VERSION" \169 -DMYSQL_SERVER_SUFFIX="-$RELEASE_TAG$WSREP_VERSION" \
169170
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh 2013-02-19 08:47:10 +0000
+++ build/build-rpm.sh 2013-04-05 15:43:03 +0000
@@ -152,7 +152,7 @@
152 "$SOURCEDIR/build/percona-xtradb-cluster.spec" > \152 "$SOURCEDIR/build/percona-xtradb-cluster.spec" > \
153 "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec"153 "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec"
154 # Issue RPM command154 # Issue RPM command
155 rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \155 rpmbuild -ba --clean $TARGET $SIGN $QUIET \
156 "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec" \156 "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec" \
157 --define "_topdir $WORKDIR_ABS" \157 --define "_topdir $WORKDIR_ABS" \
158 --define "revision $REVISION" 158 --define "revision $REVISION"
159159
=== modified file 'build/build-shared-compat-rpm.sh'
--- build/build-shared-compat-rpm.sh 2012-12-22 02:14:09 +0000
+++ build/build-shared-compat-rpm.sh 2013-04-05 15:43:03 +0000
@@ -145,7 +145,7 @@
145 cd "$WORKDIR"145 cd "$WORKDIR"
146146
147 # Issue RPM command147 # Issue RPM command
148 rpmbuild -ba --clean --with yassl $SIGN \148 rpmbuild -ba --clean $SIGN \
149 "$SOURCEDIR/build/percona-shared-compat.spec" \149 "$SOURCEDIR/build/percona-shared-compat.spec" \
150 --define "_topdir $WORKDIR_ABS" \150 --define "_topdir $WORKDIR_ABS" \
151 --define "redhat_version $REDHAT_RELEASE" \151 --define "redhat_version $REDHAT_RELEASE" \
152152
=== modified file 'build/debian/rules'
--- build/debian/rules 2013-03-21 11:44:07 +0000
+++ build/debian/rules 2013-04-05 15:43:03 +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 -DWITH_INNODB_DISALLOW_WRITES=ON \33 -DWITH_INNODB_DISALLOW_WRITES=ON \
33 -DWITH_WSREP=ON \34 -DWITH_WSREP=ON \
@@ -42,6 +43,7 @@
42 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \43 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
43 -DINSTALL_LAYOUT=DEB \44 -DINSTALL_LAYOUT=DEB \
44 -DCMAKE_BUILD_TYPE=RelWithDebInfo \45 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
46 -DWITH_SSL=system \
45 -DWITH_EMBEDDED_SERVER=OFF \47 -DWITH_EMBEDDED_SERVER=OFF \
46 -DWITH_INNODB_DISALLOW_WRITES=ON \48 -DWITH_INNODB_DISALLOW_WRITES=ON \
47 -DWITH_WSREP=ON \49 -DWITH_WSREP=ON \
4850
=== modified file 'build/percona-xtradb-cluster.spec'
--- build/percona-xtradb-cluster.spec 2013-03-28 07:55:25 +0000
+++ build/percona-xtradb-cluster.spec 2013-04-05 15:43:03 +0000
@@ -467,6 +467,7 @@
467 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \467 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
468 -DCMAKE_BUILD_TYPE=Debug \468 -DCMAKE_BUILD_TYPE=Debug \
469 -DWITH_EMBEDDED_SERVER=OFF \469 -DWITH_EMBEDDED_SERVER=OFF \
470 -DWITH_SSL=system \
470 -DENABLE_DTRACE=OFF \471 -DENABLE_DTRACE=OFF \
471 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \472 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
472 -DFEATURE_SET="%{feature_set}" \473 -DFEATURE_SET="%{feature_set}" \
@@ -487,6 +488,7 @@
487 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \488 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
488 -DCMAKE_BUILD_TYPE=RelWithDebInfo \489 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
489 -DWITH_EMBEDDED_SERVER=OFF \490 -DWITH_EMBEDDED_SERVER=OFF \
491 -DWITH_SSL=system \
490 -DENABLE_DTRACE=OFF \492 -DENABLE_DTRACE=OFF \
491 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \493 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
492 -DFEATURE_SET="%{feature_set}" \494 -DFEATURE_SET="%{feature_set}" \

Subscribers

People subscribed via source and target branches

to all changes: