Merge lp:~raghavendra-prabhu/percona-xtradb-cluster/bug-1104977 into lp:~raghavendra-prabhu/percona-xtradb-cluster/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
1=== modified file 'build/build-binary.sh'
2--- build/build-binary.sh 2013-03-21 11:44:07 +0000
3+++ build/build-binary.sh 2013-04-05 15:43:03 +0000
4@@ -163,6 +163,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="-$RELEASE_TAG$WSREP_VERSION" \
12
13=== modified file 'build/build-rpm.sh'
14--- build/build-rpm.sh 2013-02-19 08:47:10 +0000
15+++ build/build-rpm.sh 2013-04-05 15:43:03 +0000
16@@ -152,7 +152,7 @@
17 "$SOURCEDIR/build/percona-xtradb-cluster.spec" > \
18 "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec"
19 # Issue RPM command
20- rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \
21+ rpmbuild -ba --clean $TARGET $SIGN $QUIET \
22 "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec" \
23 --define "_topdir $WORKDIR_ABS" \
24 --define "revision $REVISION"
25
26=== modified file 'build/build-shared-compat-rpm.sh'
27--- build/build-shared-compat-rpm.sh 2012-12-22 02:14:09 +0000
28+++ build/build-shared-compat-rpm.sh 2013-04-05 15:43:03 +0000
29@@ -145,7 +145,7 @@
30 cd "$WORKDIR"
31
32 # Issue RPM command
33- rpmbuild -ba --clean --with yassl $SIGN \
34+ rpmbuild -ba --clean $SIGN \
35 "$SOURCEDIR/build/percona-shared-compat.spec" \
36 --define "_topdir $WORKDIR_ABS" \
37 --define "redhat_version $REDHAT_RELEASE" \
38
39=== modified file 'build/debian/rules'
40--- build/debian/rules 2013-03-21 11:44:07 +0000
41+++ build/debian/rules 2013-04-05 15:43:03 +0000
42@@ -28,6 +28,7 @@
43 $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
44 -DINSTALL_LAYOUT=DEB \
45 -DCMAKE_BUILD_TYPE=Debug \
46+ -DWITH_SSL=system \
47 -DWITH_EMBEDDED_SERVER=OFF \
48 -DWITH_INNODB_DISALLOW_WRITES=ON \
49 -DWITH_WSREP=ON \
50@@ -42,6 +43,7 @@
51 cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
52 -DINSTALL_LAYOUT=DEB \
53 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
54+ -DWITH_SSL=system \
55 -DWITH_EMBEDDED_SERVER=OFF \
56 -DWITH_INNODB_DISALLOW_WRITES=ON \
57 -DWITH_WSREP=ON \
58
59=== modified file 'build/percona-xtradb-cluster.spec'
60--- build/percona-xtradb-cluster.spec 2013-03-28 07:55:25 +0000
61+++ build/percona-xtradb-cluster.spec 2013-04-05 15:43:03 +0000
62@@ -467,6 +467,7 @@
63 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
64 -DCMAKE_BUILD_TYPE=Debug \
65 -DWITH_EMBEDDED_SERVER=OFF \
66+ -DWITH_SSL=system \
67 -DENABLE_DTRACE=OFF \
68 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
69 -DFEATURE_SET="%{feature_set}" \
70@@ -487,6 +488,7 @@
71 ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
72 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
73 -DWITH_EMBEDDED_SERVER=OFF \
74+ -DWITH_SSL=system \
75 -DENABLE_DTRACE=OFF \
76 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
77 -DFEATURE_SET="%{feature_set}" \

Subscribers

People subscribed via source and target branches

to all changes: