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

[Ignacio Nin]

Changes for release 5.5.30-30.2.

Resubmit after fixing a spurious change in an unrelated file.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-04-08 06:26:11 +0000
+++ Makefile	2013-04-11 21:08:27 +0000
@@ -1,7 +1,7 @@
 FETCH_CMD=wget
 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
 MYSQL_VERSION=5.5.30
-PERCONA_SERVER_VERSION=rel30.1
+PERCONA_SERVER_VERSION=rel30.2
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 PERCONA_SERVER_SHORT_2 ?=Percona-Server
 
=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2013-03-22 06:37:13 +0000
+++ build/build-binary.sh	2013-04-11 21:08:27 +0000
@@ -149,6 +149,7 @@
         -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
         -DWITH_EMBEDDED_SERVER=OFF \
         -DFEATURE_SET=community \
+        -DWITH_SSL=system \
         -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
         -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
         -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
 
=== modified file 'build/debian/rules'
--- build/debian/rules	2013-04-08 06:26:11 +0000
+++ build/debian/rules	2013-04-11 21:08:27 +0000
@@ -9,7 +9,7 @@
 
 feature_set="community"
 major_version=30
-minor_version=1
+minor_version=2
 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
 server_suffix="-$(major_version).$(minor_version)"
 prefix="/usr"
@@ -28,6 +28,7 @@
 	$(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
 	   -DINSTALL_LAYOUT=DEB \
 	   -DCMAKE_BUILD_TYPE=Debug \
+	   -DWITH_SSL=system \
 	   -DWITH_EMBEDDED_SERVER=OFF \
 	   -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
 	   -DFEATURE_SET=$(feature_set) \
@@ -40,6 +41,7 @@
 	cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
 	   -DINSTALL_LAYOUT=DEB \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	   -DWITH_SSL=system \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
            -DFEATURE_SET=$(feature_set) \
 
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-04-09 21:37:02 +0000
+++ build/percona-server.spec	2013-04-11 21:08:27 +0000
@@ -28,7 +28,7 @@
 %define mysql_version   5.5.30
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
 %define majorversion 30
-%define minorversion 1
+%define minorversion 2
 %define distribution  rhel%{redhatversion}
 %define percona_server_version	rel%{majorversion}.%{minorversion}
 
@@ -408,6 +408,7 @@
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
            -DWITH_EMBEDDED_SERVER=OFF \
+           -DWITH_SSL=system \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -425,6 +426,7 @@
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
            -DWITH_EMBEDDED_SERVER=OFF \
+           -DWITH_SSL=system \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \