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

[Mayank Prasad]

 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
 4346 Mayank Prasad	2012-09-10
      WL#6372 : Post-Iris changes to Server defaults.
      
      Details:
       - Reverting back code realted to innodb_log_file_size changes
        (to be done in WL#6494 now.)

    modified:
      mysql-test/include/default_mysqld.cnf
      mysql-test/include/default_mysqld_autosize.cnf
      mysql-test/r/server_defaults.result
      mysql-test/t/server_defaults.test
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/srv/srv0start.cc
=== 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,7 @@ int handle_options(int *argc, char ***ar
   { 
     char *optend;
     const struct my_option *optp_temp;
-    unsigned long default_value, max_connections;
+    ulong default_value, max_connections;
     static void* max_connections_ptr= NULL;
 
     /* 
@@ -602,19 +602,23 @@ int handle_options(int *argc, char ***ar
        pointer to address where max_connections is stored. Using this we can
        get value of max_connections.
     */
-    optp_temp= longopts;
-    char *opt_str= (char*)"max_connections="; 
-    if((opt_found= findopt(opt_str, 15, &optp_temp, NULL)))
+    if(max_connections_ptr == NULL)
     {
-      max_connections_ptr= optp_temp->value;
+      optp_temp= longopts;
+      char *opt_str= (char*)"max_connections="; 
+      opt_found= findopt(opt_str, 15, &optp_temp, NULL);
+      if(opt_found == 1)
+      {
+        max_connections_ptr= optp_temp->value;
+        max_connections= *((ulong*)max_connections_ptr);
+      }
     }
-
-    /* 
-       Get value of max_connections global variable.
-    */
-    if(max_connections_ptr)
+    else
     {
-      max_connections= *(unsigned long*)max_connections_ptr;
+      /* 
+         Get value of max_connections global variable.
+      */
+      max_connections= *((ulong*)max_connections_ptr);
     }
    
     if(!is_thread_cache_size_set)

No bundle (reason: useless for push emails).