File tree 5 files changed +15
-7
lines changed
5 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ case $MYSQL_VER in
49
49
MJ=$( echo " $MEM_G /4" | bc)
50
50
LTOMJ=$( echo " $MJ /2" | bc)
51
51
52
- [[ -z $ORIGIN_MYSQL ]] && OTHER_ENG=" " || OTHER_ENG=" -DWITH_ROCKSDB=1 -DWITH_TOKUDB=1 "
52
+ [[ -z $ORIGIN_MYSQL ]] && OTHER_ENG=" " || OTHER_ENG=" -DWITH_ROCKSDB=1 -DWITH_TOKUDB=OFF "
53
53
54
54
$CMAKE . -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_SET=community \
55
55
-DWITH_NUMA=ON -DWITH_SYSTEMD=1 -DWITH_READLINE=system -DWITH_SSL=system \
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ if [ ! -d $MYSQL_SOURCE_PATH ]; then
28
28
[[ -z $ORIGIN_MYSQL ]] || MYSQL_URL=https://dev.mysql.com/get/Downloads/MySQL-${MAJOR_VER} /mysql-${MAJOR_VER} .${MINI_VER} .tar.gz
29
29
[[ -z $ORIGIN_MYSQL ]] || MYSQL_SOURCE_TARBALL=mysql-${MAJOR_VER} .${MINI_VER} .tar.gz
30
30
echo " ORIGIN_MYSQL=$ORIGIN_MYSQL " use mysql url: $MYSQL_URL
31
- safe_curl_download $curl_retry_opt -L -C - $ MYSQL_URL -o $MYSQL_SOURCE_TARBALL && \
31
+ safe_curl_download $MYSQL_URL $MYSQL_SOURCE_TARBALL && \
32
32
mkdir -p $MYSQL_SOURCE_PATH && tar -xf $MYSQL_SOURCE_TARBALL \
33
33
-C $MYSQL_SOURCE_PATH --strip-components=1
34
34
fi
Original file line number Diff line number Diff line change @@ -11,5 +11,8 @@ apt_install() {
11
11
apt install build-essential git rsync -y
12
12
}
13
13
14
- [[ -f /usr/bin/apt ]] && apt_install
15
- [[ -f /usr/bin/yum ]] && yum_install
14
+ if [ -f /usr/bin/apt ]; then
15
+ apt_install
16
+ elif [ -f /usr/bin/yum ]; then
17
+ yum_install
18
+ fi
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ GNUPGHOME=~/gnupg && mkdir -p ~/gnupg && chmod 600 ~/gnupg \
11
11
&& yum -y install -y jemalloc pxz numactl numactl-devel rh-mysql57-mecab-devel bzip2 cmake3 libaio-devel \
12
12
ncurses-devel readline-devel libcurl-devel pam-devel bison-devel bison tmux bc patch \
13
13
openssl-devel re2-devel libtirpc-devel libedit-devel zip zstd perl-Data-Dumper \
14
+ krb5-devel cyrus-sasl-devel cyrus-sasl-scram openldap-devel zlib-devel \
14
15
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \
15
16
--slave /usr/local/bin/ctest ctest /usr/bin/ctest3 \
16
17
--slave /usr/local/bin/cpack cpack /usr/bin/cpack3 \
@@ -22,8 +23,12 @@ apt_install() {
22
23
apt install libjemalloc-dev bzip2 cmake libmecab-dev libnuma-dev libaio-dev libncurses-dev \
23
24
libreadline-dev libcurl4-openssl-dev libpam0g-dev libbison-dev bison tmux bc patch \
24
25
libssl-dev libre2-dev libtirpc-dev libedit-dev zip zstd libdata-dmp-perl pkg-config \
25
- numactl automake autoconf libtool -y
26
+ numactl automake autoconf libtool libkrb5-dev libldap-dev \
27
+ zlib1g-dev libsasl2-dev libsasl2-modules-gssapi-mit -y
26
28
}
27
29
28
- [[ -f /usr/bin/apt ]] && apt_install
29
- [[ -f /usr/bin/yum ]] && yum_install
30
+ if [ -f /usr/bin/apt ]; then
31
+ apt_install
32
+ elif [ -f /usr/bin/yum ]; then
33
+ yum_install
34
+ fi
You can’t perform that action at this time.
0 commit comments