MDEV-3860 backport --plugin-load-add (and related mysql-test changes)

  revno: 3383
  revision-id: georgi.kodinov@oracle.com-20110818083108-qa3h3ufqu4zne80a
  committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
  timestamp: Thu 2011-08-18 11:31:08 +0300
  message:

  Bug #11766001: 59026: ALLOW MULTIPLE --PLUGIN-LOAD OPTIONS
  
  Implemented support for a new command line option :
  --plugin-load-add=<comma-separated-name-equals-value-list>
  This option takes the same type of arguments that --plugin-load does
  and complements --plugin-load (that continues to operate as before) by
  appending its argument to the list specified by --plugin-load.
  So --plugin-load can be considered a composite option consisting of 
  resetting the plugin load list and then calling --plugin-load-add to process
  the argument.
  Note that the order in which you specify --plugin-load and --plugin-load-add 
  is important : "--plugin-load=x --plugin-load-add=y" will be equivalent to
  "--plugin-load=x,y" whereas "--plugin-load-add=y --plugin-load=x" will be 
  equivalent to "plugin-load=x".
  
  Incompatible change : the --help --verbose command will no longer print the 
  --plugin-load variable's values (as it doesn't have one). Otherwise both --plugin-load 
  and --plugin-load-add are mentioned in it.

21 files changed, 49 insertions, 33 deletions

diff --git a/mysql-test/include/have_archive.opt b/mysql-test/include/have_archive.opt
index cf9309d9fb0..39da455d917 100644
--- a/mysql-test/include/have_archive.opt
+++ b/mysql-test/include/have_archive.opt
@@ -1,2 +1,2 @@
 --loose-archive
---plugin-load=$HA_ARCHIVE_SO
+--plugin-load-add=$HA_ARCHIVE_SO
diff --git a/mysql-test/include/have_blackhole.opt b/mysql-test/include/have_blackhole.opt
index b600b468390..980dc27e328 100644
--- a/mysql-test/include/have_blackhole.opt
+++ b/mysql-test/include/have_blackhole.opt
@@ -1,2 +1,2 @@
 --loose-blackhole
---plugin-load=$HA_BLACKHOLE_SO
+--plugin-load-add=$HA_BLACKHOLE_SO
diff --git a/mysql-test/include/have_innodb.combinations b/mysql-test/include/have_innodb.combinations
index 6ce075b4cc2..d47d2c81a71 100644
--- a/mysql-test/include/have_innodb.combinations
+++ b/mysql-test/include/have_innodb.combinations
@@ -1,13 +1,13 @@
 [innodb_plugin]
 ignore-builtin-innodb
-plugin-load=$HA_INNODB_SO
+plugin-load-add=$HA_INNODB_SO
 innodb
 innodb-cmpmem
 innodb-trx
 
 [xtradb_plugin]
 ignore-builtin-innodb
-plugin-load=$HA_XTRADB_SO
+plugin-load-add=$HA_XTRADB_SO
 innodb
 innodb-cmpmem
 innodb-trx
diff --git a/mysql-test/include/have_plugin_auth.opt b/mysql-test/include/have_plugin_auth.opt
index ff91abb1bef..0204e148656 100644
--- a/mysql-test/include/have_plugin_auth.opt
+++ b/mysql-test/include/have_plugin_auth.opt
@@ -1 +1 @@
---plugin-load=$AUTH_TEST_PLUGIN_SO
+--plugin-load-add=$AUTH_TEST_PLUGIN_SO
diff --git a/mysql-test/include/have_xtradb.combinations b/mysql-test/include/have_xtradb.combinations
index e05e8f53508..13d8ab915f5 100644
--- a/mysql-test/include/have_xtradb.combinations
+++ b/mysql-test/include/have_xtradb.combinations
@@ -1,6 +1,6 @@
 [xtradb_plugin]
 ignore-builtin-innodb
-plugin-load=$HA_XTRADB_SO
+plugin-load-add=$HA_XTRADB_SO
 innodb
 innodb-cmpmem
 innodb-trx
diff --git a/mysql-test/include/plugin.defs b/mysql-test/include/plugin.defs
index 6fbe4f68328..d0dbfd35bee 100644
--- a/mysql-test/include/plugin.defs
+++ b/mysql-test/include/plugin.defs
@@ -9,6 +9,7 @@
 # PLUGVAR_DIR: name of directory where plugin was found
 # PLUGVAR_OPT: mysqld option --plugin_dir=....
 # PLUGVAR_LOAD: option --plugin_load=.... if the 4th element is present
+# PLUGVAR_LOAD_ADD: option --plugin_load_add=.... if the 4th element is present
 #
 # If a listed plugin is not found, the corresponding variables will be
 # set to empty, they will not be unset.
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ce964d6856d..b0dca9426ac 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -5264,9 +5264,6 @@ sub mysqld_arguments ($$$) {
   }
 
   my $found_skip_core= 0;
-  my @plugins;
-  my %seen;
-  my $plugin;
   foreach my $arg ( @$extra_opts )
   {
     # Skip --defaults-file option since it's handled above.
@@ -5286,12 +5283,6 @@ sub mysqld_arguments ($$$) {
     {
       ; # Dont add --skip-log-bin when mysqld have --log-slave-updates in config
     }
-    elsif ($plugin = mtr_match_prefix($arg,  "--plugin-load="))
-    {
-      next if $plugin =~ /=$/;
-      push @plugins, $plugin unless $seen{$plugin};
-      $seen{$plugin} = 1;
-    }
     else
     {
       mtr_add_arg($args, "%s", $arg);
@@ -5308,11 +5299,6 @@ sub mysqld_arguments ($$$) {
   mtr_add_arg($args, "--loose-debug-sync-timeout=%s",
               $opt_debug_sync_timeout) unless $opt_user_args;
 
-  if (@plugins) {
-    my $sep = (IS_WINDOWS) ? ';' : ':';
-    mtr_add_arg($args, "--plugin-load=%s" .  join($sep, @plugins));
-  }
-
   return $args;
 }
 
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index c065f949802..9fb3502c5c5 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -606,6 +606,11 @@ The following options may be given as the first argument:
  plugin is specified as ether a plugin_name=library_file
  pair or only a library_file. If the latter case, all
  plugins from a given library_file will be loaded.
+ --plugin-load-add=name 
+ Optional semicolon-separated list of plugins to load.
+ This option adds to the list speficied by --plugin-load
+ in an incremental way. It can be specified many times,
+ adding more plugins every time.
  --plugin-maturity=name 
  The lowest desirable plugin maturity (unknown,
  experimental, alpha, beta, gamma, or stable). Plugins
@@ -1115,7 +1120,6 @@ performance-schema-max-thread-instances 1000
 performance-schema-setup-actors-size 100
 performance-schema-setup-objects-size 100
 performance-schema-users-size 100
-plugin-load (No default value)
 plugin-maturity unknown
 port 3306
 port-open-timeout 0
diff --git a/mysql-test/r/plugin_load.result b/mysql-test/r/plugin_load.result
index 33116cc20ab..35bacf670a5 100644
--- a/mysql-test/r/plugin_load.result
+++ b/mysql-test/r/plugin_load.result
@@ -1,3 +1,10 @@
 SELECT @@global.example_enum_var = 'e2';
 @@global.example_enum_var = 'e2'
 1
+select plugin_name, plugin_status from information_schema.plugins
+where plugin_name in ('SIMPLE_PARSER', 'EXAMPLE',
+'DAEMON_EXAMPLE', 'TWO_QUESTIONS', 'THREE_ATTEMPTS');
+plugin_name	plugin_status
+EXAMPLE	ACTIVE
+daemon_example	ACTIVE
+simple_parser	ACTIVE
diff --git a/mysql-test/suite/federated/combinations b/mysql-test/suite/federated/combinations
index 668c1c05c50..6379074896d 100644
--- a/mysql-test/suite/federated/combinations
+++ b/mysql-test/suite/federated/combinations
@@ -1,6 +1,6 @@
 [old]
-plugin-load=$HA_FEDERATED_SO
+plugin-load-add=$HA_FEDERATED_SO
 
 [X]
-plugin-load=$HA_FEDERATEDX_SO
+plugin-load-add=$HA_FEDERATEDX_SO
 
diff --git a/mysql-test/suite/federated/have_federatedx.opt b/mysql-test/suite/federated/have_federatedx.opt
index 21f6f149f09..05d01b26b29 100644
--- a/mysql-test/suite/federated/have_federatedx.opt
+++ b/mysql-test/suite/federated/have_federatedx.opt
@@ -1 +1 @@
---plugin-load=$HA_FEDERATEDX_SO --federated
+--plugin-load-add=$HA_FEDERATEDX_SO --federated
diff --git a/mysql-test/suite/funcs_1/t/is_engines_federated.opt b/mysql-test/suite/funcs_1/t/is_engines_federated.opt
index e3c507f518d..198144ce5ac 100644
--- a/mysql-test/suite/funcs_1/t/is_engines_federated.opt
+++ b/mysql-test/suite/funcs_1/t/is_engines_federated.opt
@@ -1,2 +1,2 @@
 --loose-federated
---plugin-load=$HA_FEDERATEDX_SO
+--plugin-load-add=$HA_FEDERATEDX_SO
diff --git a/mysql-test/suite/oqgraph/suite.opt b/mysql-test/suite/oqgraph/suite.opt
index c41e40b894d..9f10d4e06ef 100644
--- a/mysql-test/suite/oqgraph/suite.opt
+++ b/mysql-test/suite/oqgraph/suite.opt
@@ -1 +1 @@
---plugin-load=$HA_OQGRAPH_SO --enable-oqgraph
+--plugin-load-add=$HA_OQGRAPH_SO --enable-oqgraph
diff --git a/mysql-test/suite/plugins/t/feedback_plugin_load.opt b/mysql-test/suite/plugins/t/feedback_plugin_load.opt
index 5fbb2f83954..6bf7594ce09 100644
--- a/mysql-test/suite/plugins/t/feedback_plugin_load.opt
+++ b/mysql-test/suite/plugins/t/feedback_plugin_load.opt
@@ -1,2 +1,2 @@
 --loose-feedback
---plugin-load=$FEEDBACK_SO
+--plugin-load-add=$FEEDBACK_SO
diff --git a/mysql-test/suite/sphinx/suite.opt b/mysql-test/suite/sphinx/suite.opt
index 6a0a190f67a..7b425b045f7 100644
--- a/mysql-test/suite/sphinx/suite.opt
+++ b/mysql-test/suite/sphinx/suite.opt
@@ -1 +1 @@
---plugin-load=$HA_SPHINX_SO --sphinx
+--plugin-load-add=$HA_SPHINX_SO --sphinx
diff --git a/mysql-test/t/plugin_auth_qa_2-master.opt b/mysql-test/t/plugin_auth_qa_2-master.opt
index 1a023ad271c..6429a4458aa 100644
--- a/mysql-test/t/plugin_auth_qa_2-master.opt
+++ b/mysql-test/t/plugin_auth_qa_2-master.opt
@@ -1 +1 @@
---plugin-load=$QA_AUTH_INTERFACE_SO
+--plugin-load-add=$QA_AUTH_INTERFACE_SO
diff --git a/mysql-test/t/plugin_auth_qa_3-master.opt b/mysql-test/t/plugin_auth_qa_3-master.opt
index 5d53a9dbe04..db4629aa09d 100644
--- a/mysql-test/t/plugin_auth_qa_3-master.opt
+++ b/mysql-test/t/plugin_auth_qa_3-master.opt
@@ -1 +1 @@
---plugin-load=$QA_AUTH_SERVER_SO
+--plugin-load-add=$QA_AUTH_SERVER_SO
diff --git a/mysql-test/t/plugin_load-master.opt b/mysql-test/t/plugin_load-master.opt
deleted file mode 100644
index aadeef2fb66..00000000000
--- a/mysql-test/t/plugin_load-master.opt
+++ /dev/null
@@ -1,2 +0,0 @@
---plugin-load=EXAMPLE=$HA_EXAMPLE_SO
---loose-plugin-example-enum-var=e2
diff --git a/mysql-test/t/plugin_load.opt b/mysql-test/t/plugin_load.opt
new file mode 100644
index 00000000000..aeeb2e4eb7d
--- /dev/null
+++ b/mysql-test/t/plugin_load.opt
@@ -0,0 +1,6 @@
+--plugin-load-add=$DIALOG_EXAMPLES_SO
+--plugin-load=$LIBDAEMON_EXAMPLE_SO
+--plugin-load-add=EXAMPLE=$HA_EXAMPLE_SO
+--plugin-load-add=$MYPLUGLIB_SO
+--plugin-load-add=$HA_EXAMPLE_SO
+--loose-plugin-example-enum-var=e2
diff --git a/mysql-test/t/plugin_load.test b/mysql-test/t/plugin_load.test
index 97b2afbe219..fdae622645a 100644
--- a/mysql-test/t/plugin_load.test
+++ b/mysql-test/t/plugin_load.test
@@ -1,4 +1,18 @@
 --source include/not_windows_embedded.inc
 --source include/have_example_plugin.inc
 
+if (!$MYPLUGLIB_SO) {
+  --echo needs SIMPLE_PARSER plugin
+}
+if (!$LIBDAEMON_EXAMPLE_SO) {
+  --echo needs DAEMON_EXAMPLE plugin
+}
+if (!$DIALOG_EXAMPLES_SO) {
+  --echo needs dialog examples plugins
+}
 SELECT @@global.example_enum_var = 'e2';
+
+--sorted_result
+select plugin_name, plugin_status from information_schema.plugins
+  where plugin_name in ('SIMPLE_PARSER', 'EXAMPLE',
+    'DAEMON_EXAMPLE', 'TWO_QUESTIONS', 'THREE_ATTEMPTS');
diff --git a/mysql-test/t/plugin_load_option-master.opt b/mysql-test/t/plugin_load_option-master.opt
index a5a12e7b0d6..be9bc9d5487 100644
--- a/mysql-test/t/plugin_load_option-master.opt
+++ b/mysql-test/t/plugin_load_option-master.opt
@@ -1,2 +1,2 @@
---plugin-load=EXAMPLE=$HA_EXAMPLE_SO
+--plugin-load-add=EXAMPLE=$HA_EXAMPLE_SO
 --loose-plugin-example=FORCE_PLUS_PERMANENT