Skip to content
Snippets Groups Projects
Commit 6930d13c authored by Andre Sailer's avatar Andre Sailer
Browse files

Merge branch 'cherry-pick-7f1e357a-LCG_107-patches' into 'LCG_107-patches'

Sweeping !2852 from master to LCG_107-patches: setup.[c]sh: add MARIADB_PLUGIN_DIR for the mariadb / mysql client to find plugin libraries

See merge request !2858
parents 1427aa54 fcd7afe8
No related tags found
1 merge request!2858Sweeping !2852 from master to LCG_107-patches: setup.[c]sh: add MARIADB_PLUGIN_DIR for the mariadb / mysql client to find plugin libraries
Pipeline #11077924 passed
......@@ -419,6 +419,7 @@ if ( -f $thisdir/bin/mariadb_config ) then
set mysql_dir=`readlink $thisdir/bin/mariadb_config`
set mysql_dir=`dirname $mysql_dir`
setenv MYSQL_HOME `dirname $mysql_dir`
setenv MARIADB_PLUGIN_DIR $MYSQL_HOME/lib/plugin
endif
#---then Apache Ant
......
......@@ -359,6 +359,7 @@ fi
#---then MySQL
if [ -f $thisdir/bin/mariadb_config ]; then
export MYSQL_HOME=$(dirname $(dirname $(readlink $thisdir/bin/mariadb_config )))
export MARIADB_PLUGIN_DIR=$MYSQL_HOME/lib/plugin
fi
#---then Apache Ant
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment