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

[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)]

review: Approve

=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2014-06-11 13:39:54 +0000
+++ build-ps/build-binary.sh	2014-07-31 10:55:29 +0000
@@ -20,6 +20,7 @@
 DEBUG_COMMENT=''
 WITH_JEMALLOC=''
 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
@@ -68,6 +69,10 @@
         WITH_JEMALLOC="$1"
         shift
         ;;
+    --with-yassl )
+        shift
+        WITH_SSL_TYPE="bundled"
+        ;;
     --with-ssl )
         shift
         WITH_SSL="$1"
@@ -199,7 +204,7 @@
         -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
         -DWITH_EMBEDDED_SERVER=OFF \
         -DFEATURE_SET=community \
-        -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" \
@@ -223,17 +228,6 @@
 
     )
 
-    # Build UDF
-    (
-        cd "UDF"
-	autoreconf --install
-        CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
-            --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
-        make $MAKE_JFLAG
-        make DESTDIR="$INSTALLDIR" install
-
-    )
-
     # Build jemalloc
     if test "x$WITH_JEMALLOC" != x
     then