From f326e1ff4014a9397b33cfbec2cf4a66bfb05358 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Sat, 4 Aug 2018 01:21:37 +0000
Subject: [PATCH] install_mysql.sh: for (new) MySQL Version 8 installation use
 password plugin 'mysql_native_password' for creating password for 'root' and
 'sys-maint' user.

---
 install_mysql.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install_mysql.sh b/install_mysql.sh
index adbb993..ae5982d 100755
--- a/install_mysql.sh
+++ b/install_mysql.sh
@@ -5064,9 +5064,9 @@ if ! $UPDATE_MYSQL ; then
          echo "" >> ${logdir}/main.log
          echo "## - Setze root Passwort für den MySQL Zugang" >> ${logdir}/main.log
          echo "## -" >> ${logdir}/main.log
-         echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '$MYSQL_ROOT_PW'\"" >> ${logdir}/main.log
+         echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e \"ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$MYSQL_ROOT_PW'\"" >> ${logdir}/main.log
 
-         ${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$MYSQL_ROOT_PW'" \
+         ${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$MYSQL_ROOT_PW'" \
             >> ${logdir}/main.log 2>&1
          if [ "$?" = "0" ]; then
             echo_ok
@@ -5239,8 +5239,8 @@ if ! $UPDATE_MYSQL || $_sys_maint_cnf_needed ; then
       echo "" >> ${logdir}/main.log
       echo "## - Erstelle maintance MySQL User '${_maint_user}' - localhost" >> ${logdir}/main.log
       echo "" >> ${logdir}/main.log
-      echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot -p$MYSQL_ROOT_PW mysql -N -s -e \"CREATE USER '${_maint_user}'@'localhost' IDENTIFIED BY '$_maint_passwd'\"" >> ${logdir}/main.log
-      ${MYSQL_INSTALL_DIR}/bin/mysql -uroot -p$MYSQL_ROOT_PW mysql -N -s -e "CREATE USER '${_maint_user}'@'localhost' IDENTIFIED BY '$_maint_passwd'" >> ${logdir}/main.log 2>&1
+      echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot -p$MYSQL_ROOT_PW mysql -N -s -e \"CREATE USER '${_maint_user}'@'localhost' IDENTIFIED WITH mysql_native_password BY '$_maint_passwd'\"" >> ${logdir}/main.log
+      ${MYSQL_INSTALL_DIR}/bin/mysql -uroot -p$MYSQL_ROOT_PW mysql -N -s -e "CREATE USER '${_maint_user}'@'localhost' IDENTIFIED WITH mysql_native_password BY '$_maint_passwd'" >> ${logdir}/main.log 2>&1
       if [ "$?" = "0" ]; then
          echo_ok
       else