mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Don't use empty string instead of --plugin-dir when plugins are not found
This commit is contained in:
@ -1404,8 +1404,8 @@ sub environment_setup {
|
|||||||
|
|
||||||
$ENV{'UDF_EXAMPLE_LIB'}=
|
$ENV{'UDF_EXAMPLE_LIB'}=
|
||||||
($lib_udf_example ? basename($lib_udf_example) : "");
|
($lib_udf_example ? basename($lib_udf_example) : "");
|
||||||
$ENV{'UDF_EXAMPLE_LIB_OPT'}=
|
$ENV{'UDF_EXAMPLE_LIB_OPT'}= "--plugin-dir=".
|
||||||
($lib_udf_example ? "--plugin_dir=" . dirname($lib_udf_example) : "");
|
($lib_udf_example ? dirname($lib_udf_example) : "");
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
# Add the path where mysqld will find ha_example.so
|
# Add the path where mysqld will find ha_example.so
|
||||||
@ -1416,9 +1416,9 @@ sub environment_setup {
|
|||||||
"$basedir/storage/example/.libs/ha_example.so",);
|
"$basedir/storage/example/.libs/ha_example.so",);
|
||||||
$ENV{'EXAMPLE_PLUGIN'}=
|
$ENV{'EXAMPLE_PLUGIN'}=
|
||||||
($lib_example_plugin ? basename($lib_example_plugin) : "");
|
($lib_example_plugin ? basename($lib_example_plugin) : "");
|
||||||
$ENV{'EXAMPLE_PLUGIN_OPT'}=
|
$ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=".
|
||||||
($lib_example_plugin ?
|
($lib_example_plugin ? dirname($lib_example_plugin) : "");
|
||||||
"--plugin_dir=" . dirname($lib_example_plugin) : "");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user