diff options
author | Joerg Bruehe <joerg@mysql.com> | 2009-09-08 16:10:06 +0200 |
---|---|---|
committer | Joerg Bruehe <joerg@mysql.com> | 2009-09-08 16:10:06 +0200 |
commit | 98ea9cdc579e295b84a1f31769be1f6b4dbbd0a7 (patch) | |
tree | 6865b46bc2aab631fe6c69a24de2878d1351c6f1 | |
parent | b4d8134a1c5bdad26d9549a2cab75b9ded192db0 (diff) | |
download | mariadb-git-98ea9cdc579e295b84a1f31769be1f6b4dbbd0a7.tar.gz |
Make sure that variables which are (or may be) usedmysql-5.4.2
in an ".opt" file are defined to some value (even
if it is empty). Without this, a test suite run
aborted on Windows for "embedded".
This fix was applied dusing the build of 5.4.2-beta.
mysql-test/mysql-test-run.pl:
From the code (function "envsubst()"), it is obvious
that any variable which is used in an ".opt" file needs
to be defined.
If the value is wrong, starting the server may fail -
but if the variable is undefined, the whole test suite
will abort.
So variables which are used in an ".opt" file should
always be defined to some value, even if it is blank.
This fix may be overkill, I did not check in detail
whether all these variables are really used in an ".opt"
file - but some are.
-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 |