bzr push into mysql-trunk branch (nirbhay.choubey:4167 to 4168) Bug#14392699

[Nirbhay Choubey]

 4168 Nirbhay Choubey	2012-08-03 [merge]
      Merge of patch for Bug#14392699 from mysql-5.6.

    modified:
      mysys_ssl/my_default.cc
      sql/sql_plugin.cc
 4167 Inaam Rana	2012-08-03 [merge]
      merge from 5.6

    modified:
      storage/innobase/srv/srv0start.cc
=== modified file 'mysys_ssl/my_default.cc'
--- a/mysys_ssl/my_default.cc	2012-06-11 15:33:10 +0000
+++ b/mysys_ssl/my_default.cc	2012-08-03 17:38:02 +0000
@@ -260,8 +260,8 @@ int my_search_option_files(const char *c
   int error= 0;
   DBUG_ENTER("my_search_option_files");
 
-  /* Skip if default files have already been read. */
-  if (! defaults_already_read)
+  /* Skip for login file. */
+  if (! is_login_file)
   {
     /* Check if we want to force the use a specific default file */
     *args_used+= get_defaults_options(*argc - *args_used, *argv + *args_used,
@@ -630,12 +630,6 @@ int my_load_defaults(const char *conf_fi
   uint args_sep= my_getopt_use_args_separator ? 1 : 0;
   DBUG_ENTER("load_defaults");
 
-  /*
-    Set it to FALSE, as this function can be invoked
-    multiple times with different conf_file.
-  */
-  defaults_already_read= FALSE;
-
   init_alloc_root(&alloc,512,0);
   if ((dirs= init_default_directories(&alloc)) == NULL)
     goto err;

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2012-06-29 11:56:41 +0000
+++ b/sql/sql_plugin.cc	2012-08-03 17:38:02 +0000
@@ -1836,6 +1836,7 @@ bool mysql_install_plugin(THD *thd, cons
 
   if (my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv, NULL))
   {
+    mysql_rwlock_unlock(&LOCK_system_variables_hash);
     report_error(REPORT_TO_USER, ER_PLUGIN_IS_NOT_LOADED, name->str);
     goto err;
   }

No bundle (reason: useless for push emails).