add usage, remove unused vars, support --mysql

scripts/common.sh

@@ -162,3 +162,17 @@ function parse_mysqlbuild() {
     fi
     test $exitcode = 0
 }
+
+# split mysql into mysql_distro and mysql_version
+function parse_mysql() {
+    local mysql=$1
+    if [[ $mysql =~ ^(mysql|mariadb)-(.*)$ ]] ; then
+        mysql_distro=${BASH_REMATCH[1]}
+        mysql_version=${BASH_REMATCH[2]}
+        if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_distro=mysql56; fi
+        exitcode=0
+    else
+        exitcode=1
+    fi
+    test $exitcode = 0
+}

scripts/make.mysql.new.bash

@@ -3,6 +3,12 @@
 set -e
 set -u
 
+function usage() {
+    echo "--mysqlbuild=$mysqlbuild"
+    echo "--mysql=$mysql"
+    return 1
+}
+
 pushd $(dirname $0)
     source ./common.sh
 popd
@@ -15,11 +21,7 @@ makejobs=$(get_ncpus)
 
 git_tag=HEAD
 mysqlbuild=
-mysql=mysql-5.5.30
-do_s3=0
-s3_build_bucket=tokutek-mysql-build
-s3_release_bucket=tokutek-mysql
-do_make_check=0
+mysql=
 cc=gcc47
 cxx=g++47
 build_debug=0