diff options
Diffstat (limited to 'storage/tokudb/scripts/make.mysql.bash')
| -rwxr-xr-x | storage/tokudb/scripts/make.mysql.bash | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/storage/tokudb/scripts/make.mysql.bash b/storage/tokudb/scripts/make.mysql.bash index 073370ce82d..9d7179e46bc 100755 --- a/storage/tokudb/scripts/make.mysql.bash +++ b/storage/tokudb/scripts/make.mysql.bash @@ -40,8 +40,8 @@ makejobs=$(get_ncpus) git_tag=HEAD mysqlbuild= mysql= -cc=gcc47 -cxx=g++47 +cc=gcc +cxx=g++ build_debug=0 build_type=community build_tgz=1 @@ -97,10 +97,11 @@ fi # download all the mysql source if [ ! -d $mysql_distro ] ; then - github_download Tokutek/$mysql_distro $(git_tree $git_tag $mysql_tree) $mysql_distro + github_download Tokutek/$mysql_repo $(git_tree $git_tag $mysql_tree) $mysql_distro-$mysql_version fi -cd $mysql_distro +cd $mysql_distro-$mysql_version +if [ $? != 0 ] ; then exit 1; fi # install the backup source if [ ! -d toku_backup ] ; then @@ -128,7 +129,9 @@ if [ ! -d storage/tokudb/ft-index ] ; then github_download Tokutek/ft-index $(git_tree $git_tag $ftindex_tree) storage/tokudb/ft-index fi -if [ ! -d storage/tokudb/ft-index/third_party/jemalloc ] ; 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 fi |