Browse Source

build any mariadb branch name

pull/73/head
Rich Prohaska 12 years ago
parent
commit
2b6da0f20f
  1. 2
      scripts/make.mysql.bash
  2. 2
      scripts/make.mysql.debug.env.bash

2
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 github_download Tokutek/ft-index $(git_tree $git_tag $ftindex_tree) storage/tokudb/ft-index
fi 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 github_download Tokutek/jemalloc $(git_tree $git_tag $jemalloc_tree) extra/jemalloc
elif [ ! -d storage/tokudb/ft-index/third_party/jemalloc ] ; then 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 github_download Tokutek/jemalloc $(git_tree $git_tag $jemalloc_tree) storage/tokudb/ft-index/third_party/jemalloc

2
scripts/make.mysql.debug.env.bash

@ -126,7 +126,7 @@ if [ $? != 0 ] ; then exit 1; fi
ln ../../$ftengine/scripts/tokufilecheck.py ln ../../$ftengine/scripts/tokufilecheck.py
if [ $? != 0 ] ; then exit 1; fi if [ $? != 0 ] ; then exit 1; fi
popd popd
if [[ $mysql_tree =~ mariadb ]] ; then
if [[ $mysql =~ mariadb ]] || [[ $mysql_tree =~ mariadb ]] ; then
pushd $mysql_tree/extra pushd $mysql_tree/extra
if [ $? != 0 ] ; then exit 1; fi if [ $? != 0 ] ; then exit 1; fi
ln -s ../../$jemalloc $jemalloc ln -s ../../$jemalloc $jemalloc

Loading…
Cancel
Save