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

[Mayank Prasad]

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

    modified:
      client/mysqltest.cc
      mysys_ssl/my_getopt.cc
 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
=== 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 unsigned long opt_max_connections= DEFAULT_MAX_CONN;
+static int 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 %ld connections",
+      die("Connection limit exhausted, you can have max %d connections",
           opt_max_connections);
   }
 

=== modified file 'mysys_ssl/my_getopt.cc'
--- a/mysys_ssl/my_getopt.cc	revid:mayank.prasad@stripped
+++ b/mysys_ssl/my_getopt.cc	revid:mayank.prasad@stripped
@@ -594,7 +594,8 @@ int handle_options(int *argc, char ***ar
   { 
     char *optend;
     const struct my_option *optp_temp;
-    ulong default_value, max_connections;
+    uint default_value;
+    int max_connections;
     static void* max_connections_ptr= NULL;
 
     /* 
@@ -610,7 +611,7 @@ int handle_options(int *argc, char ***ar
       if(opt_found == 1)
       {
         max_connections_ptr= optp_temp->value;
-        max_connections= *((ulong*)max_connections_ptr);
+        max_connections= *((int*)max_connections_ptr);
       }
     }
     else
@@ -618,7 +619,7 @@ int handle_options(int *argc, char ***ar
       /* 
          Get value of max_connections global variable.
       */
-      max_connections= *((ulong*)max_connections_ptr);
+      max_connections= *((int*)max_connections_ptr);
     }
    
     if(!is_thread_cache_size_set)

No bundle (reason: useless for push emails).