Commit 7c0a6f74 authored by rich prohaska's avatar rich prohaska

fix 5.6 build

parent 20e2a4b6
...@@ -161,7 +161,8 @@ function parse_mysqlbuild() { ...@@ -161,7 +161,8 @@ function parse_mysqlbuild() {
if [ -z $jemalloc_tree ] ; then jemalloc_tree=$jemalloc_version; fi if [ -z $jemalloc_tree ] ; then jemalloc_tree=$jemalloc_version; fi
fi fi
# 5.6 is temp in another repo # 5.6 is temp in another repo
if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_distro=mysql56; fi mysql_repo=$mysql_distro
if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_repo=mysql56; fi
else else
exitcode=1 exitcode=1
fi fi
...@@ -174,7 +175,8 @@ function parse_mysql() { ...@@ -174,7 +175,8 @@ function parse_mysql() {
if [[ $mysql =~ ^(mysql|mariadb)-(.*)$ ]] ; then if [[ $mysql =~ ^(mysql|mariadb)-(.*)$ ]] ; then
mysql_distro=${BASH_REMATCH[1]} mysql_distro=${BASH_REMATCH[1]}
mysql_version=${BASH_REMATCH[2]} mysql_version=${BASH_REMATCH[2]}
if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_distro=mysql56; fi mysql_repo=$mysql_distro
if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_repo=mysql56; fi
exitcode=0 exitcode=0
else else
exitcode=1 exitcode=1
......
...@@ -97,7 +97,7 @@ fi ...@@ -97,7 +97,7 @@ fi
# download all the mysql source # download all the mysql source
if [ ! -d $mysql_distro ] ; then 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
fi fi
cd $mysql_distro cd $mysql_distro
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment