From: Nirbhay Choubey
Date: June 11 2012 3:34pm
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:3989 to 3990) WL#5602
 WL#5603
List-Archive: http://lists.mysql.com/commits/144206
Message-Id: <20120611153412.19802.26975.3990@Nirbhay-lenovo>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3990 Nirbhay Choubey	2012-06-11
      WL#5602, WL#5603
      
      * Fix for a generic-linux build failure. (#5602)
      * Fix for a warning on OS X (#5603)
      * Restoration of permissions for mysql.cc (rev#3075)

    modified:
      client/mysql.cc*
      libmysql/CMakeLists.txt
      mysys_ssl/my_default.cc
 3989 Vasil Dimov	2012-06-11
      Add a debug-only printout to help track down Bug#14172780

    modified:
      storage/innobase/dict/dict0stats.cc
=== modified file 'client/mysql.cc' (properties changed: +x to -x)
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2012-06-09 13:16:21 +0000
+++ b/libmysql/CMakeLists.txt	2012-06-11 15:33:10 +0000
@@ -161,6 +161,8 @@ IF(HAVE_VISIBILITY_HIDDEN)
     PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
   SET_SOURCE_FILES_PROPERTIES(../sql/sha1.cc
     PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+  SET_SOURCE_FILES_PROPERTIES(../sql-common/crypt_genhash_impl.cc
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
 ENDIF()
 
 ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})

=== modified file 'mysys_ssl/my_default.cc'
--- a/mysys_ssl/my_default.cc	2012-06-10 09:28:18 +0000
+++ b/mysys_ssl/my_default.cc	2012-06-11 15:33:10 +0000
@@ -1461,7 +1461,7 @@ int my_default_get_login_file(char *file
 #endif
   else
   {
-    memset(file_name, 0, sizeof(file_name));
+    memset(file_name, 0, file_name_size);
     return 0;
   }
   /* Anything <= 0 will be treated as error. */

No bundle (reason: useless for push emails).