bzr push into mysql-trunk branch (Georgi.Kodinov:4282 to 4283)

[Georgi Kodinov]

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

    modified:
      mysys_ssl/my_getopt.cc
 4282 Tor Didriksen	2012-08-23 [merge]
      merge 5.6 => trunk

    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).