summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-02-26 14:15:34 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2011-02-26 14:15:34 +0100
commitc1bb298e36aa1515935999676fa1d35f9ec014b6 (patch)
tree8033a0bd2a1d34b92f0fe26ee5ff272ebb52869e /mysql-test/mysql-test-run.pl
parent1fa5900faf6dbc5331e1159175116235f37b0898 (diff)
downloadmariadb-git-c1bb298e36aa1515935999676fa1d35f9ec014b6.tar.gz
Fix mtr errors with Windows/embedded/plugins.
Plugins do not work on Windows/embedded, thus do not set plugin environment variables.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ed6512b9e16..d6aa08a205a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2424,7 +2424,7 @@ sub setup_vardir() {
$plugindir="$opt_vardir/plugins";
unshift (@opt_extra_mysqld_opt, "--plugin-dir=$plugindir");
mkpath($plugindir);
- if (IS_WINDOWS)
+ if (IS_WINDOWS && !$opt_embedded_server)
{
for (<../storage/*$opt_vs_config/*.dll>,
<../plugin/*$opt_vs_config/*.dll>,