Commit 36703050 authored by Joerg Bruehe's avatar Joerg Bruehe

Make sure that variables which are (or may be) used

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.
parent eb26de23
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment