Merge 10.5 into 10.6

1 files changed, 38 insertions, 38 deletions

diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index 330c54c8e62..439b51d30ff 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -170,7 +170,7 @@ my $path_config_file;           # The generated config file, var/my.cnf
 # configuration used to build them.  To make life easier, an environment
 # variable or command-line option may be specified to control which set of
 # executables will be used by the test suite.
-our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
+our $multiconfig = $ENV{'MTR_VS_CONFIG'};
 
 my @DEFAULT_SUITES= qw(
     main-
@@ -1087,7 +1087,7 @@ sub command_line_setup {
              'ssl|with-openssl'         => \$opt_ssl,
              'skip-ssl'                 => \$opt_skip_ssl,
              'compress'                 => \$opt_compress,
-             'vs-config=s'              => \$opt_vs_config,
+             'vs-config=s'              => \$multiconfig,
 
 	     # Max number of parallel threads to use
 	     'parallel=s'               => \$opt_parallel,
@@ -1271,8 +1271,8 @@ sub command_line_setup {
   {
     $path_client_bindir= mtr_path_exists("$bindir/client_release",
 					 "$bindir/client_debug",
-					 "$bindir/client/debug",
-					 "$bindir/client$opt_vs_config",
+					 "$bindir/client/$multiconfig",
+					 "$bindir/client$multiconfig",
 					 "$bindir/client",
 					 "$bindir/bin");
   }
@@ -1850,7 +1850,7 @@ sub executable_setup () {
   if ( $opt_embedded_server )
   {
     $exe_mysqltest=
-      mtr_exe_exists("$bindir/libmysqld/examples$opt_vs_config/mysqltest_embedded",
+      mtr_exe_exists("$bindir/libmysqld/examples$multiconfig/mysqltest_embedded",
                      "$path_client_bindir/mysqltest_embedded");
   }
   else
@@ -1954,10 +1954,10 @@ sub mysql_client_test_arguments(){
   # mysql_client_test executable may _not_ exist
   if ( $opt_embedded_server ) {
     $exe= mtr_exe_maybe_exists(
-            "$bindir/libmysqld/examples$opt_vs_config/mysql_client_test_embedded",
+            "$bindir/libmysqld/examples$multiconfig/mysql_client_test_embedded",
 		"$bindir/bin/mysql_client_test_embedded");
   } else {
-    $exe= mtr_exe_maybe_exists("$bindir/tests$opt_vs_config/mysql_client_test",
+    $exe= mtr_exe_maybe_exists("$bindir/tests$multiconfig/mysql_client_test",
 			       "$bindir/bin/mysql_client_test");
   }
 
@@ -2131,13 +2131,13 @@ sub environment_setup {
   $ENV{'MARIADB_CONV'}=             "$exe_mariadb_conv --character-sets-dir=$path_charsetsdir";
   if(IS_WINDOWS)
   {
-     $ENV{'MYSQL_INSTALL_DB_EXE'}=  mtr_exe_exists("$bindir/sql$opt_vs_config/mysql_install_db",
+     $ENV{'MYSQL_INSTALL_DB_EXE'}=  mtr_exe_exists("$bindir/sql$multiconfig/mysql_install_db",
        "$bindir/bin/mysql_install_db");
   }
 
   my $client_config_exe=
     mtr_exe_maybe_exists(
-        "$bindir/libmariadb/mariadb_config$opt_vs_config/mariadb_config",
+        "$bindir/libmariadb/mariadb_config$multiconfig/mariadb_config",
                "$bindir/bin/mariadb_config");
   if ($client_config_exe)
   {
@@ -2156,7 +2156,7 @@ sub environment_setup {
   # some versions, test using it should be skipped
   # ----------------------------------------------------
   my $exe_bug25714=
-      mtr_exe_maybe_exists("$bindir/tests$opt_vs_config/bug25714");
+      mtr_exe_maybe_exists("$bindir/tests$multiconfig/bug25714");
   $ENV{'MYSQL_BUG25714'}=  native_path($exe_bug25714);
 
   # ----------------------------------------------------
@@ -2173,7 +2173,7 @@ sub environment_setup {
   # my_print_defaults
   # ----------------------------------------------------
   my $exe_my_print_defaults=
-    mtr_exe_exists("$bindir/extra$opt_vs_config/my_print_defaults",
+    mtr_exe_exists("$bindir/extra$multiconfig/my_print_defaults",
 		   "$path_client_bindir/my_print_defaults");
   $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= native_path($exe_my_print_defaults);
 
@@ -2208,16 +2208,16 @@ sub environment_setup {
   # ----------------------------------------------------
   # perror
   # ----------------------------------------------------
-  my $exe_perror= mtr_exe_exists("$bindir/extra$opt_vs_config/perror",
+  my $exe_perror= mtr_exe_exists("$bindir/extra$multiconfig/perror",
 				 "$path_client_bindir/perror");
   $ENV{'MY_PERROR'}= native_path($exe_perror);
 
   # ----------------------------------------------------
   # mysql_tzinfo_to_sql
   # ----------------------------------------------------
-  my $exe_mysql_tzinfo_to_sql= mtr_exe_exists("$basedir/sql$opt_vs_config/mysql_tzinfo_to_sql",
+  my $exe_mysql_tzinfo_to_sql= mtr_exe_exists("$basedir/sql$multiconfig/mysql_tzinfo_to_sql",
                                  "$path_client_bindir/mysql_tzinfo_to_sql",
-                                 "$bindir/sql$opt_vs_config/mysql_tzinfo_to_sql");
+                                 "$bindir/sql$multiconfig/mysql_tzinfo_to_sql");
   $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql);
 
   # ----------------------------------------------------
@@ -2225,7 +2225,7 @@ sub environment_setup {
   # ----------------------------------------------------
   my $exe_replace= mtr_exe_exists(vs_config_dirs('extra', 'replace'),
                                  "$basedir/extra/replace",
-                                 "$bindir/extra$opt_vs_config/replace",
+                                 "$bindir/extra$multiconfig/replace",
                                  "$path_client_bindir/replace");
   $ENV{'REPLACE'}= native_path($exe_replace);
 
@@ -2233,7 +2233,7 @@ sub environment_setup {
   # innochecksum
   # ----------------------------------------------------
   my $exe_innochecksum=
-    mtr_exe_maybe_exists("$bindir/extra$opt_vs_config/innochecksum",
+    mtr_exe_maybe_exists("$bindir/extra$multiconfig/innochecksum",
 		         "$path_client_bindir/innochecksum");
   $ENV{'INNOCHECKSUM'}= native_path($exe_innochecksum) if $exe_innochecksum;
 
@@ -2241,13 +2241,13 @@ sub environment_setup {
   # mariabackup
   # ----------------------------------------------------
   my $exe_mariabackup= mtr_exe_maybe_exists(
-      "$bindir/extra/mariabackup$opt_vs_config/mariabackup",
+      "$bindir/extra/mariabackup$multiconfig/mariabackup",
       "$path_client_bindir/mariabackup");
 
   $ENV{XTRABACKUP}= native_path($exe_mariabackup) if $exe_mariabackup;
 
   my $exe_xbstream= mtr_exe_maybe_exists(
-        "$bindir/extra/mariabackup/$opt_vs_config/mbstream",
+        "$bindir/extra/mariabackup/$multiconfig/mbstream",
         "$path_client_bindir/mbstream");
   $ENV{XBSTREAM}= native_path($exe_xbstream) if $exe_xbstream;
 
@@ -2439,10 +2439,10 @@ sub setup_vardir() {
       {
         if (!$opt_embedded_server)
         {
-          for (<$bindir/storage/*$opt_vs_config/*.dll>,
-               <$bindir/plugin/*$opt_vs_config/*.dll>,
-               <$bindir/libmariadb$opt_vs_config/*.dll>,
-               <$bindir/sql$opt_vs_config/*.dll>)
+          for (<$bindir/storage/*$multiconfig/*.dll>,
+               <$bindir/plugin/*$multiconfig/*.dll>,
+               <$bindir/libmariadb$multiconfig/*.dll>,
+               <$bindir/sql$multiconfig/*.dll>)
           {
             my $pname=basename($_);
             copy rel2abs($_), "$plugindir/$pname";
@@ -2459,12 +2459,11 @@ sub setup_vardir() {
           unlink "$plugindir/symlink_test";
         }
 
-        for (<$bindir/storage/*/*.so>,
-             <$bindir/plugin/*/*.so>,
-             <$bindir/plugin/*/auth_pam_tool_dir>,
+        for (<$bindir/storage/*$multiconfig/*.so>,
+             <$bindir/plugin/*$multiconfig/*.so>,
              <$bindir/libmariadb/plugins/*/*.so>,
-             <$bindir/libmariadb/*.so>,
-             <$bindir/sql/*.so>)
+             <$bindir/libmariadb/$multiconfig/*.so>,
+             <$bindir/sql$multiconfig/*.so>)
         {
           my $pname=basename($_);
           if ($opt_use_copy)
@@ -2584,7 +2583,7 @@ sub check_debug_support {
 
 
 #
-# Helper function to find the correct value for the opt_vs_config
+# Helper function to find the correct value for the multiconfig
 # if it was not set explicitly.
 #
 # the configuration with the most recent build dir in sql/ is selected.
@@ -2595,29 +2594,30 @@ sub check_debug_support {
 # executables, and plugins - that is, something that can affect the test suite
 #
 sub fix_vs_config_dir () {
-  return $opt_vs_config="" unless IS_WINDOWS;
-  return $opt_vs_config="/$opt_vs_config" if $opt_vs_config;
+  return $multiconfig="/$multiconfig" if $multiconfig;
 
   my $modified = 1e30;
-  $opt_vs_config="";
+  $multiconfig="";
 
 
-  for (<$bindir/sql/*/mysqld.exe>) { #/
+  for (<$bindir/sql/*/mysqld.exe>,
+      <$bindir/sql/*/mysqld>
+  ) { #/
     if (-M $_ < $modified)
     {
       $modified = -M _;
-      $opt_vs_config = basename(dirname($_));
+      $multiconfig = basename(dirname($_));
     }
   }
 
-  mtr_report("VS config: $opt_vs_config");
-  $opt_vs_config="/$opt_vs_config" if $opt_vs_config;
+  mtr_report("VS config: $multiconfig");
+  $multiconfig="/$multiconfig" if $multiconfig;
 }
 
 
 #
 # Helper function to handle configuration-based subdirectories which Visual
-# Studio uses for storing binaries.  If opt_vs_config is set, this returns
+# Studio uses for storing binaries.  If multiconfig is set, this returns
 # a path based on that setting; if not, it returns paths for the default
 # /release/ and /debug/ subdirectories.
 #
@@ -2631,9 +2631,9 @@ sub vs_config_dirs ($$) {
   # Don't look in these dirs when not on windows
   return () unless IS_WINDOWS;
 
-  if ($opt_vs_config)
+  if ($multiconfig)
   {
-    return ("$basedir/$path_part/$opt_vs_config/$exe");
+    return ("$basedir/$path_part/$multiconfig/$exe");
   }
 
   return ("$basedir/$path_part/release/$exe",