5.3->5.5 merge

1 files changed, 15 insertions, 0 deletions

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 06ead26414c..3024d9d2e46 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -3449,6 +3449,19 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
                             opt->name, plugin_name);
         }
       }
+      /*
+        PLUGIN_VAR_STR command-line options without PLUGIN_VAR_MEMALLOC, point
+        directly to values in the argv[] array. For plugins started at the
+        server startup, argv[] array is allocated with load_defaults(), and
+        freed when the server is shut down.  But for plugins loaded with
+        INSTALL PLUGIN, the memory allocated with load_defaults() is freed with
+        freed() at the end of mysql_install_plugin(). Which means we cannot
+        allow any pointers into that area.
+        Thus, for all plugins loaded after the server was started,
+        we force all command-line options to be PLUGIN_VAR_MEMALLOC
+      */
+      if (mysqld_server_started && !(opt->flags & PLUGIN_VAR_NOCMDOPT))
+        opt->flags|= PLUGIN_VAR_MEMALLOC;
       break;
     case PLUGIN_VAR_ENUM:
       if (!opt->check)
@@ -3610,6 +3623,8 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp,
   */
   if (!my_strcasecmp(&my_charset_latin1, tmp->name.str, "ndbcluster"))
     plugin_load_option= PLUGIN_OFF;
+  if (!my_strcasecmp(&my_charset_latin1, tmp->name.str, "feedback"))
+    plugin_load_option= PLUGIN_OFF;
 
   for (opt= tmp->plugin->system_vars; opt && *opt; opt++)
     count+= 2; /* --{plugin}-{optname} and --plugin-{plugin}-{optname} */