소스 검색

Add mariadb-10.1.sh

lj2007331 9 년 전
부모
커밋
984844de1e
11개의 변경된 파일254개의 추가작업 그리고 43개의 파일을 삭제
  1. 8 7
      apps.conf
  2. 5 0
      include/jemalloc.sh
  3. 3 3
      include/mariadb-10.0.sh
  4. 198 0
      include/mariadb-10.1.sh
  5. 3 3
      include/mariadb-5.5.sh
  6. 4 4
      include/mysql-5.5.sh
  7. 4 4
      include/mysql-5.6.sh
  8. 5 5
      include/mysql-5.7.sh
  9. 4 4
      include/percona-5.5.sh
  10. 4 4
      include/percona-5.6.sh
  11. 16 9
      install.sh

+ 8 - 7
apps.conf

@@ -13,15 +13,16 @@ apr_version=1.5.2
 apr_util_version=1.5.4
 
 # DB
-mysql_7_version=5.7.9
-mysql_6_version=5.6.27
-mysql_5_version=5.5.46
+mysql_5_7_version=5.7.9
+mysql_5_6_version=5.6.27
+mysql_5_5_version=5.5.46
 
-mariadb_10_version=10.0.21
-mariadb_5_version=5.5.46
+mariadb_10_1_version=10.1.8
+mariadb_10_0_version=10.0.21
+mariadb_5_5_version=5.5.46
 
-percona_6_version=5.6.25-73.1
-percona_5_version=5.5.45-37.4
+percona_5_6_version=5.6.25-73.1
+percona_5_5_version=5.5.45-37.4
 
 # JDK
 jdk_6_version=1.6.0_45

+ 5 - 0
include/jemalloc.sh

@@ -18,6 +18,11 @@ cd jemalloc-$jemalloc_version
 ./configure
 make && make install
 if [ -f "/usr/local/lib/libjemalloc.so" ];then
+    if [ "$OS_BIT" == '64' ];then
+        ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib64/libjemalloc.so.1
+    else
+        ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib/libjemalloc.so.1
+    fi
     echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
     ldconfig
     echo "${CSUCCESS}jemalloc module install successfully! ${CEND}"

+ 3 - 3
include/mariadb-10.0.sh

@@ -18,15 +18,15 @@ 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 
 
-src_url=$DOWN_ADDR/mariadb-${mariadb_10_version}/bintar-${GLIBC_FLAG}-$SYS_BIT_a/mariadb-${mariadb_10_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz && Download_src
+src_url=$DOWN_ADDR/mariadb-${mariadb_10_0_version}/bintar-${GLIBC_FLAG}-$SYS_BIT_a/mariadb-${mariadb_10_0_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
 mkdir -p $mariadb_data_dir;chown mysql.mysql -R $mariadb_data_dir
-tar zxf mariadb-${mariadb_10_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz 
+tar zxf mariadb-${mariadb_10_0_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz 
 [ ! -d "$mariadb_install_dir" ] && mkdir -p $mariadb_install_dir
-mv mariadb-${mariadb_10_version}-linux-${SYS_BIT_b}/* $mariadb_install_dir 
+mv mariadb-${mariadb_10_0_version}-linux-${SYS_BIT_b}/* $mariadb_install_dir 
 if [ "$je_tc_malloc" == '1' ];then
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' $mariadb_install_dir/bin/mysqld_safe
 elif [ "$je_tc_malloc" == '2' ];then

+ 198 - 0
include/mariadb-10.1.sh

@@ -0,0 +1,198 @@
+#!/bin/bash
+# Author:  yeho <lj2007331 AT gmail.com>
+# BLOG:  https://blog.linuxeye.com
+#
+# Notes: OneinStack for CentOS/RadHat 5+ Debian 6+ and Ubuntu 12+
+#
+# Project home page:
+#       http://oneinstack.com
+#       https://github.com/lj2007331/oneinstack
+
+Install_MariaDB-10-1()
+{
+cd $oneinstack_dir/src
+
+[ "$IPADDR_STATE"x == "CN"x ] && DOWN_ADDR=http://mirrors.aliyun.com/mariadb || DOWN_ADDR=https://downloads.mariadb.org/f
+
+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 
+
+src_url=$DOWN_ADDR/mariadb-${mariadb_10_1_version}/bintar-${GLIBC_FLAG}-$SYS_BIT_a/mariadb-${mariadb_10_1_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz && Download_src
+
+id -u mysql >/dev/null 2>&1
+[ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
+
+mkdir -p $mariadb_data_dir;chown mysql.mysql -R $mariadb_data_dir
+tar zxf mariadb-${mariadb_10_1_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz 
+[ ! -d "$mariadb_install_dir" ] && mkdir -p $mariadb_install_dir
+mv mariadb-${mariadb_10_1_version}-linux-${SYS_BIT_b}/* $mariadb_install_dir 
+if [ "$je_tc_malloc" == '1' ];then
+    sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' $mariadb_install_dir/bin/mysqld_safe
+elif [ "$je_tc_malloc" == '2' ];then
+    sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libtcmalloc.so@' $mariadb_install_dir/bin/mysqld_safe
+fi
+
+if [ -d "$mariadb_install_dir/support-files" ];then
+    echo "${CSUCCESS}MariaDB install successfully! ${CEND}"
+else
+    rm -rf $mariadb_install_dir
+    echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}" 
+    kill -9 $$
+fi
+
+/bin/cp $mariadb_install_dir/support-files/mysql.server /etc/init.d/mysqld
+sed -i "s@^basedir=.*@basedir=$mariadb_install_dir@" /etc/init.d/mysqld
+sed -i "s@^datadir=.*@datadir=$mariadb_data_dir@" /etc/init.d/mysqld
+chmod +x /etc/init.d/mysqld
+OS_CentOS='chkconfig --add mysqld \n
+chkconfig mysqld on'
+OS_Debian_Ubuntu='update-rc.d mysqld defaults'
+OS_command
+cd ..
+
+# my.cf
+[ -d "/etc/mysql" ] && /bin/mv /etc/mysql{,_bk}
+cat > /etc/my.cnf << EOF
+[client]
+port = 3306
+socket = /tmp/mysql.sock
+default-character-set = utf8mb4
+
+[mysqld]
+port = 3306
+socket = /tmp/mysql.sock
+
+basedir = $mariadb_install_dir
+datadir = $mariadb_data_dir
+pid-file = $mariadb_data_dir/mysql.pid
+user = mysql
+bind-address = 0.0.0.0
+server-id = 1
+
+init-connect = 'SET NAMES utf8mb4'
+character-set-server = utf8mb4
+
+skip-name-resolve
+#skip-networking
+back_log = 300
+
+max_connections = 1000
+max_connect_errors = 6000
+open_files_limit = 65535
+table_open_cache = 128 
+max_allowed_packet = 4M
+binlog_cache_size = 1M
+max_heap_table_size = 8M
+tmp_table_size = 16M
+
+read_buffer_size = 2M
+read_rnd_buffer_size = 8M
+sort_buffer_size = 8M
+join_buffer_size = 8M
+key_buffer_size = 4M
+
+thread_cache_size = 8
+
+query_cache_type = 1
+query_cache_size = 8M
+query_cache_limit = 2M
+
+ft_min_word_len = 4
+
+log_bin = mysql-bin
+binlog_format = mixed
+expire_logs_days = 30
+
+log_error = $mariadb_data_dir/mysql-error.log
+slow_query_log = 1
+long_query_time = 1
+slow_query_log_file = $mariadb_data_dir/mysql-slow.log
+
+performance_schema = 0
+
+#lower_case_table_names = 1
+
+skip-external-locking
+
+default_storage_engine = InnoDB
+#default-storage-engine = MyISAM
+innodb_file_per_table = 1
+innodb_open_files = 500
+innodb_buffer_pool_size = 64M
+innodb_write_io_threads = 4
+innodb_read_io_threads = 4
+innodb_thread_concurrency = 0
+innodb_purge_threads = 1
+innodb_flush_log_at_trx_commit = 2
+innodb_log_buffer_size = 2M
+innodb_log_file_size = 32M
+innodb_log_files_in_group = 3
+innodb_max_dirty_pages_pct = 90
+innodb_lock_wait_timeout = 120
+
+bulk_insert_buffer_size = 8M
+myisam_sort_buffer_size = 8M
+myisam_max_sort_file_size = 10G
+myisam_repair_threads = 1
+
+interactive_timeout = 28800
+wait_timeout = 28800
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[myisamchk]
+key_buffer_size = 8M
+sort_buffer_size = 8M
+read_buffer = 4M
+write_buffer = 4M
+EOF
+
+if [ $Mem -gt 1500 -a $Mem -le 2500 ];then
+    sed -i 's@^thread_cache_size.*@thread_cache_size = 16@' /etc/my.cnf
+    sed -i 's@^query_cache_size.*@query_cache_size = 16M@' /etc/my.cnf
+    sed -i 's@^myisam_sort_buffer_size.*@myisam_sort_buffer_size = 16M@' /etc/my.cnf
+    sed -i 's@^key_buffer_size.*@key_buffer_size = 16M@' /etc/my.cnf
+    sed -i 's@^innodb_buffer_pool_size.*@innodb_buffer_pool_size = 128M@' /etc/my.cnf
+    sed -i 's@^tmp_table_size.*@tmp_table_size = 32M@' /etc/my.cnf
+    sed -i 's@^table_open_cache.*@table_open_cache = 256@' /etc/my.cnf
+elif [ $Mem -gt 2500 -a $Mem -le 3500 ];then
+    sed -i 's@^thread_cache_size.*@thread_cache_size = 32@' /etc/my.cnf
+    sed -i 's@^query_cache_size.*@query_cache_size = 32M@' /etc/my.cnf
+    sed -i 's@^myisam_sort_buffer_size.*@myisam_sort_buffer_size = 32M@' /etc/my.cnf
+    sed -i 's@^key_buffer_size.*@key_buffer_size = 64M@' /etc/my.cnf
+    sed -i 's@^innodb_buffer_pool_size.*@innodb_buffer_pool_size = 512M@' /etc/my.cnf
+    sed -i 's@^tmp_table_size.*@tmp_table_size = 64M@' /etc/my.cnf
+    sed -i 's@^table_open_cache.*@table_open_cache = 512@' /etc/my.cnf
+elif [ $Mem -gt 3500 ];then
+    sed -i 's@^thread_cache_size.*@thread_cache_size = 64@' /etc/my.cnf
+    sed -i 's@^query_cache_size.*@query_cache_size = 64M@' /etc/my.cnf
+    sed -i 's@^myisam_sort_buffer_size.*@myisam_sort_buffer_size = 64M@' /etc/my.cnf
+    sed -i 's@^key_buffer_size.*@key_buffer_size = 256M@' /etc/my.cnf
+    sed -i 's@^innodb_buffer_pool_size.*@innodb_buffer_pool_size = 1024M@' /etc/my.cnf
+    sed -i 's@^tmp_table_size.*@tmp_table_size = 128M@' /etc/my.cnf
+    sed -i 's@^table_open_cache.*@table_open_cache = 1024@' /etc/my.cnf
+fi
+
+$mariadb_install_dir/scripts/mysql_install_db --user=mysql --basedir=$mariadb_install_dir --datadir=$mariadb_data_dir
+
+chown mysql.mysql -R $mariadb_data_dir
+service mysqld start
+[ -z "`grep ^'export PATH=' /etc/profile`" ] && echo "export PATH=$mariadb_install_dir/bin:\$PATH" >> /etc/profile 
+[ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep $mariadb_install_dir /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=$mariadb_install_dir/bin:\1@" /etc/profile
+. /etc/profile
+
+$mariadb_install_dir/bin/mysql -e "grant all privileges on *.* to root@'127.0.0.1' identified by \"$dbrootpwd\" with grant option;"
+$mariadb_install_dir/bin/mysql -e "grant all privileges on *.* to root@'localhost' identified by \"$dbrootpwd\" with grant option;"
+$mariadb_install_dir/bin/mysql -uroot -p$dbrootpwd -e "delete from mysql.user where Password='';"
+$mariadb_install_dir/bin/mysql -uroot -p$dbrootpwd -e "delete from mysql.db where User='';"
+$mariadb_install_dir/bin/mysql -uroot -p$dbrootpwd -e "delete from mysql.proxies_priv where Host!='localhost';"
+$mariadb_install_dir/bin/mysql -uroot -p$dbrootpwd -e "drop database test;"
+$mariadb_install_dir/bin/mysql -uroot -p$dbrootpwd -e "reset master;"
+rm -rf /etc/ld.so.conf.d/{mysql,mariadb,percona}*.conf
+echo "$mariadb_install_dir/lib" > /etc/ld.so.conf.d/mariadb.conf 
+ldconfig
+service mysqld stop
+}

+ 3 - 3
include/mariadb-5.5.sh

@@ -18,15 +18,15 @@ 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 
 
-src_url=$DOWN_ADDR/mariadb-${mariadb_5_version}/bintar-${GLIBC_FLAG}-$SYS_BIT_a/mariadb-${mariadb_5_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz && Download_src
+src_url=$DOWN_ADDR/mariadb-${mariadb_5_5_version}/bintar-${GLIBC_FLAG}-$SYS_BIT_a/mariadb-${mariadb_5_5_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
 mkdir -p $mariadb_data_dir;chown mysql.mysql -R $mariadb_data_dir
-tar zxf mariadb-${mariadb_5_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz 
+tar zxf mariadb-${mariadb_5_5_version}-${GLIBC_FLAG}-${SYS_BIT_b}.tar.gz 
 [ ! -d "$mariadb_install_dir" ] && mkdir -p $mariadb_install_dir
-mv mariadb-${mariadb_5_version}-linux-${SYS_BIT_b}/* $mariadb_install_dir 
+mv mariadb-${mariadb_5_5_version}-linux-${SYS_BIT_b}/* $mariadb_install_dir 
 if [ "$je_tc_malloc" == '1' ];then
      sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' $mariadb_install_dir/bin/mysqld_safe
 elif [ "$je_tc_malloc" == '2' ];then

+ 4 - 4
include/mysql-5.5.sh

@@ -11,14 +11,14 @@
 Install_MySQL-5-5()
 {
 cd $oneinstack_dir/src
-src_url=http://cdn.mysql.com/Downloads/MySQL-5.5/mysql-$mysql_5_version.tar.gz && Download_src
+src_url=http://cdn.mysql.com/Downloads/MySQL-5.5/mysql-$mysql_5_5_version.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
 mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
-tar zxf mysql-$mysql_5_version.tar.gz
-cd mysql-$mysql_5_version
+tar zxf mysql-$mysql_5_5_version.tar.gz
+cd mysql-$mysql_5_5_version
 if [ "$je_tc_malloc" == '1' ];then
     EXE_LINKER="-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc'"
 elif [ "$je_tc_malloc" == '2' ];then
@@ -48,7 +48,7 @@ make install
 if [ -d "$mysql_install_dir/support-files" ];then
     echo "${CSUCCESS}MySQL install successfully! ${CEND}"
     cd ..
-    rm -rf mysql-$mysql_6_version
+    rm -rf mysql-$mysql_5_6_version
 else
     rm -rf $mysql_install_dir
     echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"

+ 4 - 4
include/mysql-5.6.sh

@@ -11,14 +11,14 @@
 Install_MySQL-5-6()
 {
 cd $oneinstack_dir/src
-src_url=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-$mysql_6_version.tar.gz && Download_src
+src_url=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-$mysql_5_6_version.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
 mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
-tar zxf mysql-$mysql_6_version.tar.gz
-cd mysql-$mysql_6_version
+tar zxf mysql-$mysql_5_6_version.tar.gz
+cd mysql-$mysql_5_6_version
 if [ "$je_tc_malloc" == '1' ];then
     EXE_LINKER="-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc'"
 elif [ "$je_tc_malloc" == '2' ];then
@@ -46,7 +46,7 @@ make install
 if [ -d "$mysql_install_dir/support-files" ];then
     echo "${CSUCCESS}MySQL install successfully! ${CEND}"
     cd ..
-    rm -rf mysql-$mysql_6_version
+    rm -rf mysql-$mysql_5_6_version
 else
     rm -rf $mysql_install_dir
     echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"

+ 5 - 5
include/mysql-5.7.sh

@@ -12,18 +12,18 @@ Install_MySQL-5-7()
 {
 cd $oneinstack_dir/src
 
-[ "$IPADDR_STATE"x == "CN"x ] && { DOWN_ADDR_MYSQL=http://linuxeye.file.alimmdn.com/oneinstack/src; DOWN_ADDR_BOOST=$DOWN_ADDR_MYSQL; } || { DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.7; DOWN_ADDR_BOOST=http://downloads.sourceforge.net/project/boost/boost/1.59.0; }
+[ "$IPADDR_STATE"x == "CN"x ] && { DOWN_ADDR_MYSQL=http://mirrors.linuxeye.com/oneinstack/src; DOWN_ADDR_BOOST=$DOWN_ADDR_MYSQL; } || { DOWN_ADDR_MYSQL=http://cdn.mysql.com/Downloads/MySQL-5.7; DOWN_ADDR_BOOST=http://downloads.sourceforge.net/project/boost/boost/1.59.0; }
 
 src_url=$DOWN_ADDR_BOOST/boost_1_59_0.tar.gz && Download_src
-src_url=$DOWN_ADDR_MYSQL/mysql-$mysql_7_version.tar.gz && Download_src
+src_url=$DOWN_ADDR_MYSQL/mysql-$mysql_5_7_version.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
 mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
 tar xzf boost_1_59_0.tar.gz
-tar zxf mysql-$mysql_7_version.tar.gz
-cd mysql-$mysql_7_version
+tar zxf mysql-$mysql_5_7_version.tar.gz
+cd mysql-$mysql_5_7_version
 if [ "$je_tc_malloc" == '1' ];then
     EXE_LINKER="-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc'"
 elif [ "$je_tc_malloc" == '2' ];then
@@ -53,7 +53,7 @@ make install
 if [ -d "$mysql_install_dir/support-files" ];then
     echo "${CSUCCESS}MySQL install successfully! ${CEND}"
     cd ..
-    rm -rf mysql-$mysql_7_version
+    rm -rf mysql-$mysql_5_7_version
 else
     rm -rf $mysql_install_dir
     echo "${CFAILURE}MySQL install failed, Please contact the author! ${CEND}"

+ 4 - 4
include/percona-5.5.sh

@@ -11,14 +11,14 @@
 Install_Percona-5-5()
 {
 cd $oneinstack_dir/src
-src_url=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-$percona_5_version/source/tarball/percona-server-$percona_5_version.tar.gz && Download_src
+src_url=https://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-$percona_5_5_version/source/tarball/percona-server-$percona_5_5_version.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
 mkdir -p $percona_data_dir;chown mysql.mysql -R $percona_data_dir
-tar zxf percona-server-$percona_5_version.tar.gz 
-cd percona-server-$percona_5_version 
+tar zxf percona-server-$percona_5_5_version.tar.gz 
+cd percona-server-$percona_5_5_version 
 if [ "$je_tc_malloc" == '1' ];then
     EXE_LINKER="-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc'"
 elif [ "$je_tc_malloc" == '2' ];then
@@ -47,7 +47,7 @@ make install
 if [ -d "$percona_install_dir/support-files" ];then
     echo "${CSUCCESS}Percona install successfully! ${CEND}"
     cd ..
-    rm -rf percona-server-$percona_5_version
+    rm -rf percona-server-$percona_5_5_version
 else
     rm -rf $percona_install_dir
     echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"

+ 4 - 4
include/percona-5.6.sh

@@ -11,14 +11,14 @@
 Install_Percona-5-6()
 {
 cd $oneinstack_dir/src
-src_url=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-$percona_6_version/source/tarball/percona-server-$percona_6_version.tar.gz && Download_src
+src_url=https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-$percona_5_6_version/source/tarball/percona-server-$percona_5_6_version.tar.gz && Download_src
 
 id -u mysql >/dev/null 2>&1
 [ $? -ne 0 ] && useradd -M -s /sbin/nologin mysql
 
 mkdir -p $percona_data_dir;chown mysql.mysql -R $percona_data_dir
-tar zxf percona-server-$percona_6_version.tar.gz 
-cd percona-server-$percona_6_version 
+tar zxf percona-server-$percona_5_6_version.tar.gz 
+cd percona-server-$percona_5_6_version 
 if [ "$je_tc_malloc" == '1' ];then
     EXE_LINKER="-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc'"
 elif [ "$je_tc_malloc" == '2' ];then
@@ -46,7 +46,7 @@ make install
 if [ -d "$percona_install_dir/support-files" ];then
     echo "${CSUCCESS}Percona install successfully! ${CEND}"
     cd ..
-    rm -rf percona-server-$percona_6_version 
+    rm -rf percona-server-$percona_5_6_version 
 else
     rm -rf $percona_install_dir
     echo "${CFAILURE}Percona install failed, Please contact the author! ${CEND}"

+ 16 - 9
install.sh

@@ -177,14 +177,15 @@ do
                 echo -e "\t${CMSG}1${CEND}. Install MySQL-5.7"
                 echo -e "\t${CMSG}2${CEND}. Install MySQL-5.6"
                 echo -e "\t${CMSG}3${CEND}. Install MySQL-5.5"
-                echo -e "\t${CMSG}4${CEND}. Install MariaDB-10.0"
-                echo -e "\t${CMSG}5${CEND}. Install MariaDB-5.5"
-                echo -e "\t${CMSG}6${CEND}. Install Percona-5.6"
-                echo -e "\t${CMSG}7${CEND}. Install Percona-5.5"
+                echo -e "\t${CMSG}4${CEND}. Install MariaDB-10.1"
+                echo -e "\t${CMSG}5${CEND}. Install MariaDB-10.0"
+                echo -e "\t${CMSG}6${CEND}. Install MariaDB-5.5"
+                echo -e "\t${CMSG}7${CEND}. Install Percona-5.6"
+                echo -e "\t${CMSG}8${CEND}. Install Percona-5.5"
                 read -p "Please input a number:(Default 2 press Enter) " DB_version
                 [ -z "$DB_version" ] && DB_version=2
-                if [ $DB_version != 1 -a $DB_version != 2 -a $DB_version != 3 -a $DB_version != 4 -a $DB_version != 5 -a $DB_version != 6 -a $DB_version != 7 ];then
-                    echo "${CWARNING}input error! Please only input number 1,2,3,4,5,6,7${CEND}"
+                if [ $DB_version != 1 -a $DB_version != 2 -a $DB_version != 3 -a $DB_version != 4 -a $DB_version != 5 -a $DB_version != 6 -a $DB_version != 7 -a $DB_version != 8 ];then
+                    echo "${CWARNING}input error! Please only input number 1,2,3,4,5,6,7,8${CEND}"
                 else
                     while :
                     do
@@ -504,6 +505,9 @@ 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
+    . 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
     . include/tcmalloc.sh
     Install_tcmalloc | tee -a $oneinstack_dir/install.log
@@ -520,15 +524,18 @@ elif [ "$DB_version" == '3' ];then
     . include/mysql-5.5.sh
     Install_MySQL-5-5 2>&1 | tee -a $oneinstack_dir/install.log
 elif [ "$DB_version" == '4' ];then
+    . include/mariadb-10.1.sh
+    Install_MariaDB-10-1 2>&1 | tee -a $oneinstack_dir/install.log 
+elif [ "$DB_version" == '5' ];then
     . include/mariadb-10.0.sh
     Install_MariaDB-10-0 2>&1 | tee -a $oneinstack_dir/install.log 
-elif [ "$DB_version" == '5' ];then
+elif [ "$DB_version" == '6' ];then
     . include/mariadb-5.5.sh
     Install_MariaDB-5-5 2>&1 | tee -a $oneinstack_dir/install.log 
-elif [ "$DB_version" == '6' ];then
+elif [ "$DB_version" == '7' ];then
     . include/percona-5.6.sh
     Install_Percona-5-6 2>&1 | tee -a $oneinstack_dir/install.log
-elif [ "$DB_version" == '7' ];then
+elif [ "$DB_version" == '8' ];then
     . include/percona-5.5.sh 
     Install_Percona-5-5 2>&1 | tee -a $oneinstack_dir/install.log 
 fi