bzr push into mysql-5.6 branch (Georgi.Kodinov:4154 to 4155)

[Georgi Kodinov]

 4155 Georgi Kodinov	2012-08-23 [merge]
      merge

    modified:
      mysys_ssl/my_getopt.cc
 4154 Tor Didriksen	2012-08-23
      Bug#12762891 SSL.CMAKE FILE IS BROKEN WHEN USING CUSTOM OPENSSL BUILD
      Bug#14167227 CMAKE SHOULD REJECT -DWITH_SSL=SYSTEM IF OPENSSL IS OLDER THAN 1.0.0
      
      Added functionality to use custom installation of openssl.
      # - a custom installation of openssl can be used like this
      #     - cmake -DCMAKE_PREFIX_PATH=</path/to/custom/openssl> -DWITH_SSL="system"
      #   or
      #     - cmake -DWITH_SSL=</path/to/custom/openssl>

    modified:
      cmake/ssl.cmake
      mysys_ssl/crypt_genhash_impl.cc
      sql-common/client_authentication.cc
      storage/perfschema/unittest/CMakeLists.txt
=== modified file 'mysys_ssl/my_getopt.cc'
--- a/mysys_ssl/my_getopt.cc	2012-06-09 14:11:09 +0000
+++ b/mysys_ssl/my_getopt.cc	2012-08-23 09:39:24 +0000
@@ -737,6 +737,11 @@ static int setval(const struct my_option
           }
           *(ulong*)value= arg;
         }
+        else if (type < 0)
+        {
+          res= EXIT_AMBIGUOUS_OPTION;
+          goto ret;
+        }
         else
           *(ulong*)value= type - 1;
       }

No bundle (reason: useless for push emails).