Bug#28341329 : COMPONENT OPTIONS WITH --LOOSE PREFIX AREN'T CONSIDERED

               AFTER INSTALLATION

Description:
Server does not load component variables specified in the configuration file
when the component is installed after server start up.

Cache plugin and component variables specified in the configuration file.

Fix:
Added functionality to load component variables specified in the
configuration file during component installation.

Added functionality to cache plugin and component variables
specified in the configuration file during server start up.
The server loads the cached variable values instead of rereading
the configuration file during plugin and component installation.

Change-Id: I5c1633b70daee536d9522692bde38909df894a84

Author: Omar Sharieff

mysql-test/suite/service_sys_var_registration/r/sys_var_service_loose_cnf.result

@@ -0,0 +1,6 @@
+INSTALL COMPONENT "file://component_test_sys_var_service";
+SELECT @@test_component.str_sys_var;
+@@test_component.str_sys_var
+12
+UNINSTALL COMPONENT "file://component_test_sys_var_service";
+# restart:

mysql-test/suite/service_sys_var_registration/t/sys_var_service_loose_cnf.test

@@ -0,0 +1,36 @@
+--source ../include/have_component_test_sys_var_service.inc
+
+--disable_query_log
+call mtr.add_suppression("duplicate variable name");
+--enable_query_log
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQL_BASEDIR= `SELECT @@basedir`;
+let $MYSQL_SOCKET= `SELECT @@socket`;
+let $MYSQL_PIDFILE= `SELECT @@pid_file`;
+let $MYSQL_PORT= `SELECT @@port`;
+let $MYSQL_MESSAGESDIR= `SELECT @@lc_messages_dir`;
+let $MYSQL_SERVER_ID= `SELECT @@server_id`;
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--write_file $MYSQLTEST_VARDIR/tmp/sys_reg.cnf
+[mysqld]
+loose-test_component.str_sys_var=12
+EOF
+
+--exec echo "restart:--defaults-file=$MYSQLTEST_VARDIR/tmp/sys_reg.cnf" --basedir=$MYSQL_BASEDIR --datadir=$MYSQLD_DATADIR --socket=$MYSQL_SOCKET --pid-file=$MYSQL_PIDFILE --port=$MYSQL_PORT --lc-messages-dir=$MYSQL_MESSAGESDIR --server-id=$MYSQL_SERVER_ID --secure-file-priv="" --innodb_dedicated_server=OFF --skip-mysqlx > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+INSTALL COMPONENT "file://component_test_sys_var_service";
+SELECT @@test_component.str_sys_var;
+UNINSTALL COMPONENT "file://component_test_sys_var_service";
+
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+--remove_file $MYSQLD_DATADIR/test_component_sys_var_service.log
+let $restart_parameters = restart:;
+--source include/restart_mysqld.inc
+--remove_file $MYSQLTEST_VARDIR/tmp/sys_reg.cnf

sql/mysqld.cc

@@ -1208,6 +1208,8 @@ uint host_cache_size;
 ulong log_error_verbosity = 3;  // have a non-zero value during early start-up
 bool opt_keyring_migration_to_component = false;
 bool opt_persist_sensitive_variables_in_plaintext{true};
+int argc_cached;
+char **argv_cached;
 
 #if defined(_WIN32)
 /*
@@ -7308,6 +7310,11 @@ int mysqld_main(int argc, char **argv)
     return 1;
   }
 
+  argc_cached = argc;
+  argv_cached = new (&argv_alloc) char *[argc_cached + 1];
+  memcpy(argv_cached, argv, argc_cached * sizeof(char *));
+  argv_cached[argc_cached] = nullptr;
+
   /* Set data dir directory paths */
   strmake(mysql_real_data_home, get_relative_path(MYSQL_DATADIR),
           sizeof(mysql_real_data_home) - 1);

sql/mysqld.h

@@ -847,4 +847,22 @@ extern Deployed_components *g_deployed_components;
 extern bool opt_persist_sensitive_variables_in_plaintext;
 
 void persisted_variables_refresh_keyring_support();
+
+/**
+  Stores the value of argc during server start up that contains
+  the count of arguments specified by the user in the
+  configuration files and command line.
+  The server refers the cached argument count during
+  plugin and component installation.
+*/
+extern int argc_cached;
+/**
+  Stores the value of argv during server start up that contains
+  the vector of arguments specified by the user in the
+  configuration files and command line.
+  The server refers the cached argument vector during
+  plugin and component installation.
+*/
+extern char **argv_cached;
+
 #endif /* MYSQLD_INCLUDED */

sql/server_component/component_sys_var_service.cc

@@ -351,10 +351,9 @@ DEFINE_BOOL_METHOD(mysql_component_sys_variable_imp::register_variable,
       if (mysqld_server_started) {
         Persisted_variables_cache *pv =
             Persisted_variables_cache::get_instance();
-        argc_copy = orig_argc;
+        argc_copy = argc_cached;
         argv_copy = new (&local_root) char *[argc_copy + 1];
-        memcpy(argv_copy, orig_argv, argc_copy * sizeof(char *));
-        argv_copy[argc_copy] = nullptr;
+        memcpy(argv_copy, argv_cached, (argc_copy + 1) * sizeof(char *));
         argc = &argc_copy;
         argv = &argv_copy;
         if (pv && pv->append_read_only_variables(argc, argv, true, true,

sql/sql_plugin.cc

@@ -38,7 +38,6 @@
 #include "my_base.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
-#include "my_default.h"  // free_defaults
 #include "my_getopt.h"
 #include "my_inttypes.h"
 #include "my_list.h"
@@ -2254,8 +2253,9 @@ static bool mysql_install_plugin(THD *thd, LEX_CSTRING name,
                                  const LEX_STRING *dl) {
   TABLE *table;
   bool error = true;
-  int argc = orig_argc;
-  char **argv = orig_argv;
+  int argc;
+  char **argv;
+  char **argv_copy;
   st_plugin_int *tmp = nullptr;
   bool store_infoschema_metadata = false;
   dd::Schema_MDL_locker mdl_handler(thd);
@@ -2327,16 +2327,18 @@ static bool mysql_install_plugin(THD *thd, LEX_CSTRING name,
   mysql_mutex_lock(&LOCK_plugin);
 
   {
-    MEM_ROOT alloc{PSI_NOT_INSTRUMENTED, 512};
-    my_getopt_use_args_separator = true;
-    if (my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv,
-                         &alloc, nullptr)) {
+    argc = argc_cached;
+    if (!(argv_copy =
+              (char **)my_memdup(PSI_NOT_INSTRUMENTED, argv_cached,
+                                 (argc + 1) * sizeof(char *), MYF(0)))) {
       mysql_mutex_unlock(&LOCK_plugin);
       mysql_rwlock_unlock(&LOCK_system_variables_hash);
-      report_error(REPORT_TO_USER, ER_PLUGIN_IS_NOT_LOADED, name.str);
+      report_error(REPORT_TO_USER, ER_OUTOFMEMORY,
+                   static_cast<int>((argc + 1) * sizeof(char *)));
       goto err;
     }
-    my_getopt_use_args_separator = false;
+    argv = argv_copy;
+
     /*
      Append parse early and static variables present in mysqld-auto.cnf file
      for the newly installed plugin to process those options which are specific
@@ -2472,6 +2474,7 @@ static bool mysql_install_plugin(THD *thd, LEX_CSTRING name,
   }
 
 err:
+  my_free(argv_copy);
   mysql_mutex_unlock(&LOCK_plugin_install);
   return end_transaction(thd, error);
 }