1 files changed, 28 insertions, 3 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 349cba26b75..b5b8a92f1ec 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -102,6 +102,7 @@ use mtr_unique;
 use mtr_results;
 use IO::Socket::INET;
 use IO::Select;
+use Time::HiRes qw(gettimeofday);
 
 require "mtr_process.pl";
 require "mtr_io.pl";
@@ -2292,6 +2293,10 @@ sub environment_setup {
   $ENV{'EXE_MYSQL'}=                $exe_mysql;
   $ENV{'MYSQL_PLUGIN'}=             $exe_mysql_plugin;
   $ENV{'MYSQL_EMBEDDED'}=           $exe_mysql_embedded;
+  if(IS_WINDOWS)
+  {
+     $ENV{'MYSQL_INSTALL_DB_EXE'}=  mtr_exe_exists("$bindir/sql$opt_vs_config/mysql_install_db");
+  }
 
   my $client_config_exe=
     mtr_exe_maybe_exists(
@@ -2603,8 +2608,22 @@ sub setup_vardir() {
         unlink "$plugindir/symlink_test";
       }
 
+      for (<$bindir/plugin/auth_pam/auth_pam_tool>)
+      {
+        mkpath("$plugindir/auth_pam_tool_dir");
+        if ($opt_use_copy)
+        {
+          copy rel2abs($_), "$plugindir/auth_pam_tool_dir/auth_pam_tool"
+        }
+        else
+        {
+          symlink rel2abs($_), "$plugindir/auth_pam_tool_dir/auth_pam_tool";
+        }
+      }
+
       for (<$bindir/storage/*/*.so>,
            <$bindir/plugin/*/*.so>,
+           <$bindir/plugin/*/auth_pam_tool_dir>,
            <$bindir/libmariadb/plugins/*/*.so>,
            <$bindir/libmariadb/*.so>,
            <$bindir/sql/*.so>)
@@ -3226,8 +3245,8 @@ sub mysql_install_db {
                             $bootstrap_sql_file);
 
       # mysql.gtid_slave_pos was created in InnoDB, but many tests
-      # run without InnoDB. Alter it to MyISAM now
-      mtr_tofile($bootstrap_sql_file, "ALTER TABLE gtid_slave_pos ENGINE=MyISAM;\n");
+      # run without InnoDB. Alter it to Aria now
+      mtr_tofile($bootstrap_sql_file, "ALTER TABLE gtid_slave_pos ENGINE=Aria transactional=0;\n");
     }
     else
     {
@@ -3244,7 +3263,7 @@ sub mysql_install_db {
 
     # Remove anonymous users
     mtr_tofile($bootstrap_sql_file,
-         "DELETE FROM mysql.user where user= '';\n");
+         "DELETE FROM mysql.global_priv where user= '';\n");
 
     # Create mtr database
     mtr_tofile($bootstrap_sql_file,
@@ -3267,6 +3286,7 @@ sub mysql_install_db {
   # Create directories mysql and test
   mkpath("$install_datadir/mysql");
 
+  my $realtime= gettimeofday();
   if ( My::SafeProcess->run
        (
 	name          => "bootstrap",
@@ -3284,6 +3304,10 @@ sub mysql_install_db {
               "Could not install system database from $bootstrap_sql_file\n" .
 	      "The $path_bootstrap_log file contains:\n$data\n");
   }
+  else
+  {
+    mtr_verbose("Spent " . sprintf("%.3f", (gettimeofday() - $realtime)) . " seconds in bootstrap");
+  }
 }
 
 
@@ -4467,6 +4491,7 @@ sub extract_warning_lines ($$) {
      qr|Access denied for user|,
      qr|Aborted connection|,
      qr|table.*is full|,
+     qr|\[ERROR\] mysqld: \Z|,  # Warning from Aria recovery
      qr|Linux Native AIO|, # warning that aio does not work on /dev/shm
      qr|InnoDB: io_setup\(\) attempt|,
      qr|InnoDB: io_setup\(\) failed with EAGAIN|,