diff --git a/scripts/make.mysql.bash b/scripts/make.mysql.bash index 06410a8ecb1..5d1ea8d6864 100755 --- a/scripts/make.mysql.bash +++ b/scripts/make.mysql.bash @@ -129,7 +129,7 @@ if [ ! -d storage/tokudb/ft-index ] ; then github_download Tokutek/ft-index $(git_tree $git_tag $ftindex_tree) storage/tokudb/ft-index fi -if [[ $mysql_distro =~ ^mariadb ]] ; then +if [[ $mysql_repo =~ mariadb ]] || [[ $mysql_distro =~ ^mariadb ]] ; then github_download Tokutek/jemalloc $(git_tree $git_tag $jemalloc_tree) extra/jemalloc elif [ ! -d storage/tokudb/ft-index/third_party/jemalloc ] ; then github_download Tokutek/jemalloc $(git_tree $git_tag $jemalloc_tree) storage/tokudb/ft-index/third_party/jemalloc diff --git a/scripts/make.mysql.debug.env.bash b/scripts/make.mysql.debug.env.bash index fba27053086..36d3ec65520 100755 --- a/scripts/make.mysql.debug.env.bash +++ b/scripts/make.mysql.debug.env.bash @@ -126,7 +126,7 @@ if [ $? != 0 ] ; then exit 1; fi ln ../../$ftengine/scripts/tokufilecheck.py if [ $? != 0 ] ; then exit 1; fi popd -if [[ $mysql_tree =~ mariadb ]] ; then +if [[ $mysql =~ mariadb ]] || [[ $mysql_tree =~ mariadb ]] ; then pushd $mysql_tree/extra if [ $? != 0 ] ; then exit 1; fi ln -s ../../$jemalloc $jemalloc