From 84d92e455768dadc46bd85ad124e8f16652c1e28 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 30 Jun 2022 11:11:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=9F=A5=E9=81=93=E5=8F=8D?= =?UTF-8?q?=E5=BA=94=E6=83=85=E5=86=B5=EF=BC=8C=E5=85=88=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/mysql/versions/5.6/install.sh | 4 ++-- plugins/mysql/versions/5.7/install.sh | 2 +- plugins/mysql/versions/8.0/install.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh index 31f193176..b4392f034 100755 --- a/plugins/mysql/versions/5.6/install.sh +++ b/plugins/mysql/versions/5.6/install.sh @@ -61,8 +61,8 @@ Install_mysql() -DDEFAULT_CHARSET=utf8mb4 \ -DCMAKE_C_COMPILER=/usr/bin/gcc \ -DCMAKE_CXX_COMPILER=/usr/bin/g++ \ - -DDEFAULT_COLLATION=utf8mb4_general_ci \ - && make ${MAKEJN:--j2} && make install && make clean + -DDEFAULT_COLLATION=utf8mb4_general_ci + make clean && make && make install && make clean if [ -d $serverPath/mysql ];then diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh index 76376cb9a..f41cc2ca3 100755 --- a/plugins/mysql/versions/5.7/install.sh +++ b/plugins/mysql/versions/5.7/install.sh @@ -78,7 +78,7 @@ Install_mysql() -DCMAKE_C_COMPILER=/usr/bin/gcc \ -DCMAKE_CXX_COMPILER=/usr/bin/g++ \ -DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/ - make ${MAKEJN:--j2} && make install && make clean + make clean && make && make install && make clean echo '5.7' > $serverPath/mysql/version.pl echo '安装完成' > $install_tmp fi diff --git a/plugins/mysql/versions/8.0/install.sh b/plugins/mysql/versions/8.0/install.sh index 6a29558c0..e6617ce89 100755 --- a/plugins/mysql/versions/8.0/install.sh +++ b/plugins/mysql/versions/8.0/install.sh @@ -79,7 +79,7 @@ Install_mysql() -DCMAKE_C_COMPILER=/usr/bin/gcc \ -DCMAKE_CXX_COMPILER=/usr/bin/g++ \ -DWITH_BOOST=${mysqlDir}/mysql-8.0.25/boost/ - make ${MAKEJN:--j2} && make install && make clean + make clean && make && make install && make clean if [ -d $serverPath/mysql ];then echo '8.0' > $serverPath/mysql/version.pl