bzr push into mysql-trunk branch (joerg.bruehe:4908 to 4909)

[Joerg Bruehe]

 4909 Joerg Bruehe	2012-11-05 [merge]
      Auto-upmerge

    modified:
      support-files/mysql.spec.sh
 4908 horst.hunger@stripped	2012-11-05 [merge]
      merge from 5.6

    modified:
      mysql-test/suite/sys_vars/t/slow_launch_time_func.test
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-11-02 17:30:27 +0000
+++ b/support-files/mysql.spec.sh	2012-11-05 14:43:57 +0000
@@ -434,6 +434,15 @@ export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${
 export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
 export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-}
 
+# By default, a build will include the bundeled "yaSSL" library for SSL.
+# However, there may be a need to override.
+# Protect against undefined variables if there is no override option.
+%if %{undefined with_ssl}
+%define ssl_option   %{nil}
+%else
+%define ssl_option   -DWITH_SSL=%{with_ssl}
+%endif
+
 # Build debug mysqld and libmysqld.a
 mkdir debug
 (
@@ -457,6 +466,7 @@ mkdir debug
            -DCMAKE_BUILD_TYPE=Debug \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
+           %{ssl_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
            -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
   echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
@@ -472,6 +482,7 @@ mkdir release
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
+           %{ssl_option} \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
            -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
@@ -1149,6 +1160,11 @@ echo "====="                            
 # merging BK trees)
 ##############################################################################
 %changelog
+* Mon Nov 05 2012 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Allow to override the default to use the bundled yaSSL by an option like
+      --define="with_ssl /path/to/ssl"
+
 * Wed Oct 10 2012 Bjorn Munch <bjorn.munch@stripped>
 
 - Replace old my-*.cnf config file examples with template my-default.cnf

No bundle (reason: useless for push emails).