diff options
author | Elena Stepanova <elenst@montyprogram.com> | 2015-07-25 00:58:36 +0300 |
---|---|---|
committer | Elena Stepanova <elenst@montyprogram.com> | 2015-07-25 00:58:36 +0300 |
commit | 2ebedfa998bd9f3f2255b05607a9cb09b6def93d (patch) | |
tree | 87f6aa15e978bf5979c3ae08488346892a9aad05 /mysql-test/mysql-test-run.pl | |
parent | a6ab8ef9d7d465a3f0bc1cff6034ca97575629dd (diff) | |
download | mariadb-git-2ebedfa998bd9f3f2255b05607a9cb09b6def93d.tar.gz |
MDEV-8532 MTR cannot run with --embedded on Windows on a source build
Do not attempt to run unix-specific code on Windows
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index befd47d9c94..46bc64a6fcc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2686,15 +2686,18 @@ sub setup_vardir() { { $plugindir="$opt_vardir/plugins"; mkpath($plugindir); - if (IS_WINDOWS && !$opt_embedded_server) + if (IS_WINDOWS) { - for (<$bindir/storage/*$opt_vs_config/*.dll>, - <$bindir/plugin/*$opt_vs_config/*.dll>, - <$bindir/sql$opt_vs_config/*.dll>) + if (!$opt_embedded_server) { - my $pname=basename($_); - copy rel2abs($_), "$plugindir/$pname"; - set_plugin_var($pname); + for (<$bindir/storage/*$opt_vs_config/*.dll>, + <$bindir/plugin/*$opt_vs_config/*.dll>, + <$bindir/sql$opt_vs_config/*.dll>) + { + my $pname=basename($_); + copy rel2abs($_), "$plugindir/$pname"; + set_plugin_var($pname); + } } } else |