From fbf0b7acce2aab285251639eefe6cae58476a8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Tue, 21 Nov 2023 11:19:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20mysql=5Fupgrade=20=E5=8F=AA=E5=9C=A8=205?=
 =?UTF-8?q?7=20=E7=89=88=E6=9C=AC=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/mysql/update.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/mysql/update.sh b/scripts/mysql/update.sh
index 3e7bbac3..8ac8f2f9 100644
--- a/scripts/mysql/update.sh
+++ b/scripts/mysql/update.sh
@@ -137,10 +137,12 @@ chmod 644 ${mysqlPath}/conf/my.cnf
 systemctl start mysqld
 
 # 执行更新后的初始化
+if [[ "${1}" == "57" ]]; then
+    ${mysqlPath}/bin/mysql_upgrade -uroot -p${mysqlPassword}
+fi
 ${mysqlPath}/bin/mysql -uroot -p${mysqlPassword} -e "DROP DATABASE test;"
 ${mysqlPath}/bin/mysql -uroot -p${mysqlPassword} -e "DELETE FROM mysql.user WHERE user='';"
 ${mysqlPath}/bin/mysql -uroot -p${mysqlPassword} -e "FLUSH PRIVILEGES;"
-${mysqlPath}/bin/mysql_upgrade -uroot -p${mysqlPassword} --force
 
 panel writePlugin mysql${1} ${mysqlVersion}