Merge lp:~tplavcic/percona-server/ps-bld138-5.6 into lp:percona-server/5.6

[Tomislav Plavcic]

Added option to build-binary.sh to build with yassl.

5.1 uses just --with-ssl (without path) when building with yassl
5.5 & 5.6 use --with-ssl=bundled (for yassl) and --with-ssl=system (for openssl)

Also for 5.5 it was removed "make UDF" from build-binary since it was ported to cmake (seems it was removed from 5.6 already).

It was tested with these builds:
http://jenkins.percona.com/view/TEST/job/percona-server-5.1-binaries-test-yassl/6/label_exp=centos6-64/
http://jenkins.percona.com/job/percona-server-5.5-binary-tarballs-test/label_exp=centos5-64/1/
http://jenkins.percona.com/job/percona-server-5.6-binaries-release-test/label_exp=centos6-64/8/

[Laurynas Biveinis (laurynas-biveinis)]

The description mentions 5.5 make UDF removal but there is only 5.6 MP?

review: Needs Information

[Tomislav Plavcic (tplavcic)]

Sorry, there is also 5.1 and 5.5 MP's but lp is showing that it is still updating those branches.
Will overwrite branches to see if it updates info, sometimes it just hangs like that forever.
I'll contact you when it's ok.

[Tomislav Plavcic (tplavcic)]

Now it seems to be refreshed, the other two MP's are:
https://code.launchpad.net/~tplavcic/percona-server/ps-bld138-5.5/+merge/228999
https://code.launchpad.net/~tplavcic/percona-server/ps-bld138-5.1/+merge/228998

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2014-07-17 14:24:55 +0000
+++ build-ps/build-binary.sh	2014-07-31 09:35:48 +0000
@@ -19,6 +19,7 @@
 WITH_JEMALLOC=''
 DEBUG_EXTNAME=''
 WITH_SSL='/usr'
+WITH_SSL_TYPE='system'
 OPENSSL_INCLUDE=''
 OPENSSL_LIBRARY=''
 CRYPTO_LIBRARY=''
@@ -34,7 +35,7 @@
 if ! getopt --test
 then
     go_out="$(getopt --options=iqdvjt: \
-        --longoptions=i686,quiet,debug,valgrind,with-jemalloc:,with-ssl:,tag: \
+        --longoptions=i686,quiet,debug,valgrind,with-jemalloc:,with-yassl,with-ssl:,tag: \
         --name="$(basename "$0")" -- "$@")"
     test $? -eq 0 || exit 1
     eval set -- $go_out
@@ -69,6 +70,10 @@
         WITH_JEMALLOC="$1"
         shift
         ;;
+    --with-yassl )
+        shift
+        WITH_SSL_TYPE="bundled"
+        ;;
     --with-ssl )
         shift
         WITH_SSL="$1"
@@ -220,7 +225,7 @@
         -DWITH_EMBEDDED_SERVER=OFF \
         -DFEATURE_SET=community \
         -DENABLE_DTRACE=OFF \
-        -DWITH_SSL=system \
+        -DWITH_SSL="$WITH_SSL_TYPE" \
         -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
         -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
         -DCOMPILATION_COMMENT="$COMMENT" \