Update check_os.sh

include/check_os.sh

@@ -40,8 +40,7 @@ else
     SYS_BIT_a=x86;SYS_BIT_b=i686;
 fi
 
-LIBC_VERSION=`getconf -a | grep GNU_LIBC_VERSION | awk '{print $NF}'`
-LIBC_YN=`echo "$LIBC_VERSION < 2.14" | bc`
-[ $LIBC_YN == '1' ] && GLIBC_FLAG=linux || GLIBC_FLAG=linux-glibc_214
+LIBC_YN=$(awk -v A=`getconf -a | grep GNU_LIBC_VERSION | awk '{print $NF}'` -v B=2.14 'BEGIN{print(A>=B)?"0":"1"}')
+[ $LIBC_YN == '0' ] && GLIBC_FLAG=linux-glibc_214 || GLIBC_FLAG=linux
 
 THREAD=$(grep 'processor' /proc/cpuinfo | sort -u | wc -l)

install.sh

@@ -468,10 +468,12 @@ fi
 if [ "$je_tc_malloc_yn" == 'y' -a "$je_tc_malloc" == '1' -a ! -e "/usr/local/lib/libjemalloc.so" ];then
     . include/jemalloc.sh
     Install_jemalloc | tee -a $oneinstack_dir/install.log
-elif [ "$DB_version" == '4' -a ! -e "/usr/local/lib/libjemalloc.so" ];then
+fi
+if [ "$DB_version" == '4' -a ! -e "/usr/local/lib/libjemalloc.so" ];then
     . include/jemalloc.sh
     Install_jemalloc | tee -a $oneinstack_dir/install.log
-elif [ "$je_tc_malloc_yn" == 'y' -a "$je_tc_malloc" == '2' -a ! -e "/usr/local/lib/libtcmalloc.so" ];then
+fi
+if [ "$je_tc_malloc_yn" == 'y' -a "$je_tc_malloc" == '2' -a ! -e "/usr/local/lib/libtcmalloc.so" ];then
     . include/tcmalloc.sh
     Install_tcmalloc | tee -a $oneinstack_dir/install.log
 fi

versions.txt

@@ -20,7 +20,7 @@ mysql_5_7_version=5.7.13
 mysql_5_6_version=5.6.31
 mysql_5_5_version=5.5.50
 
-mariadb_10_1_version=10.1.15
+mariadb_10_1_version=10.1.14
 mariadb_10_0_version=10.0.26
 mariadb_5_5_version=5.5.50