diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-09-17 15:29:31 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-09-17 15:29:31 +0200 |
| commit | d0408492669d37167708ac6e2642327d2deb5e5f (patch) | |
| tree | dc48024ca58892c2af94c59b4741e32fbebfc1f5 /mysql-test/mysql-test-run.pl | |
| parent | 68fd9874b3669576ca10739b7cd9dad78e2ec7d1 (diff) | |
| parent | 55eb4962c2e58d322a02c32ea322e69c49f5ae6a (diff) | |
| download | mariadb-git-d0408492669d37167708ac6e2642327d2deb5e5f.tar.gz | |
Merge "trunk-build" (including 5.4.2-beta) and "trunk".
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7591e091992..cdc7dbb01cd 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1781,6 +1781,14 @@ sub environment_setup { $ENV{'HA_EXAMPLE_SO'}="'".$plugin_filename."'"; $ENV{'EXAMPLE_PLUGIN_LOAD'}="--plugin_load=;EXAMPLE=".$plugin_filename.";"; } + else + { + # Some ".opt" files use some of these variables, so they must be defined + $ENV{'EXAMPLE_PLUGIN'}= ""; + $ENV{'EXAMPLE_PLUGIN_OPT'}= ""; + $ENV{'HA_EXAMPLE_SO'}= ""; + $ENV{'EXAMPLE_PLUGIN_LOAD'}= ""; + } # ---------------------------------------------------- # Add the path where mysqld will find mypluglib.so |