Merge trunk-bugfixing -> trunk-runtime

mysql-test/include/not_parallel.inc

+if (`SELECT '$MTR_PARALLEL' > 1`) {
+  --skip test requires --parallel=1
+}

mysql-test/mysql-test-run.pl

@@ -362,6 +362,7 @@ sub main {
     $opt_parallel= 1 if ($opt_parallel < 1);
     mtr_report("Using parallel: $opt_parallel");
   }
+  $ENV{MTR_PARALLEL} = $opt_parallel;
 
   # Create server socket on any free port
   my $server = new IO::Socket::INET
@@ -1826,7 +1827,7 @@ sub find_plugin($$)
     mtr_file_exists(vs_config_dirs($location,$plugin_filename),
                     "$basedir/lib/plugin/".$plugin_filename,
                     "$basedir/$location/.libs/".$plugin_filename,
-					"$basedir/lib/mysql/plugin/".$plugin_filename,
+                    "$basedir/lib/mysql/plugin/".$plugin_filename,
                     );
   return $lib_example_plugin;
 }
@@ -1943,6 +1944,16 @@ sub environment_setup {
     }
   }
 
+  # ----------------------------------------------------
+  # Add the paths where mysqld will find archive/blackhole/federated plugins.
+  # ----------------------------------------------------
+  $ENV{'ARCHIVE_PLUGIN_DIR'} =
+    dirname(find_plugin("ha_archive", "storage/archive"));
+  $ENV{'BLACKHOLE_PLUGIN_DIR'} =
+    dirname(find_plugin("ha_blackhole", "storage/blackhole"));
+  $ENV{'FEDERATED_PLUGIN_DIR'} =
+    dirname(find_plugin("ha_federated", "storage/federated"));
+
   # ----------------------------------------------------
   # Add the path where mysqld will find mypluglib.so
   # ----------------------------------------------------

mysql-test/suite/federated/federated_plugin-master.opt

---plugin_dir=../storage/federated/.libs
-
+--plugin_dir=$FEDERATED_PLUGIN_DIR

mysql-test/suite/federated/federated_plugin.test

 --source include/not_windows.inc
 --source include/have_federated_plugin.inc
 
+--skip federated plugin is disabled
+
 CREATE TABLE t1(a int) ENGINE=FEDERATED;
 DROP TABLE t1;
 

mysql-test/t/archive_plugin-master.opt

---plugin_dir=../storage/archive/.libs
+--plugin_dir=$ARCHIVE_PLUGIN_DIR

mysql-test/t/archive_plugin.test

 --source include/not_windows.inc
 --source include/have_archive_plugin.inc
 
+# When running in parallel we get
+# Warning 1620 Plugin is busy and will be uninstalled on shutdown
+--source include/not_parallel.inc
+
 CREATE TABLE t1(a int) ENGINE=ARCHIVE;
 DROP TABLE t1;
 

mysql-test/t/blackhole_plugin-master.opt

---plugin_dir=../storage/blackhole/.libs
+--plugin_dir=$BLACKHOLE_PLUGIN_DIR

mysql-test/t/blackhole_plugin.test

 --source include/not_windows.inc
 --source include/have_blackhole_plugin.inc
 
+# When running in parallel we get
+# Warning 1620 Plugin is busy and will be uninstalled on shutdown
+--source include/not_parallel.inc
+
 CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
 DROP TABLE t1;