bzr push into mysql-trunk branch (mayank.prasad:4347 to 4348) WL#6372

[Mayank Prasad]

 4348 Mayank Prasad	2012-09-10
      WL#6372 : Post-Iris changes to Server defaults
            
      Details:
       - Probable fix 2 for crash on Sparc-64 (only non-debug)

    modified:
      client/mysqltest.cc
 4347 Mayank Prasad	2012-09-10
      WL#6372 : Post-Iris changes to Server defaults
      
      Details:
       - Probable fix for crash on Sparc-64 (only non-debug)

    modified:
      mysys_ssl/my_getopt.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	revid:mayank.prasad@stripped
+++ b/client/mysqltest.cc	revid:mayank.prasad@stripped
@@ -102,7 +102,7 @@ const char *opt_include= 0, *opt_charset
 static int opt_port= 0;
 static int opt_max_connect_retries;
 static int opt_result_format_version;
-static int opt_max_connections= DEFAULT_MAX_CONN;
+static unsigned long opt_max_connections= DEFAULT_MAX_CONN;
 static my_bool opt_compress= 0, silent= 0, verbose= 0;
 static my_bool debug_info_flag= 0, debug_check_flag= 0;
 static my_bool tty_password= 0;
@@ -5600,7 +5600,7 @@ void do_connect(struct st_command *comma
   else
   {
     if (!(con_slot= find_connection_by_name("-closed_connection-")))
-      die("Connection limit exhausted, you can have max %d connections",
+      die("Connection limit exhausted, you can have max %ld connections",
           opt_max_connections);
   }
 

No bundle (reason: useless for push emails).