diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 18:06:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 18:06:31 +0300 |
| commit | 36f8cca6f31941ca6bf5f45cbfdbc9ea676707d9 (patch) | |
| tree | f108b3fb41444b17062293e107879234ca557de5 /mysql-test/lib/My | |
| parent | 489ef007bec398c3b7b628325b225c3a015922cf (diff) | |
| parent | f9b856b0525dd9d82a9b42be690a26a295c73c64 (diff) | |
| download | mariadb-git-st-10.4-merge.tar.gz | |
Merge 10.3 into 10.4st-10.4-merge
Diffstat (limited to 'mysql-test/lib/My')
| -rw-r--r-- | mysql-test/lib/My/Find.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index b5a07ac8632..b8c13752212 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -159,7 +159,7 @@ sub my_build_path_list { # User can select to look in a special build dir # which is a subdirectory of any of the paths my @extra_dirs; - my $build_dir= $::opt_vs_config || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR}; + my $build_dir= $::multiconfig || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR}; push(@extra_dirs, $build_dir) if defined $build_dir; if (defined $extension){ |