install_mysql.sh: fix error in creating system tables and also in setting root password if MySQL version is 5.6 or smaller.

This commit is contained in:
Christoph 2018-08-11 03:57:36 +02:00
parent f326e1ff40
commit 9159d67120

View File

@ -2247,7 +2247,10 @@ if ! $UPDATE_MYSQL ; then
cd $MYSQL_INSTALL_DIR cd $MYSQL_INSTALL_DIR
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]] ; then if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]] \
|| ( [[ "$MYSQL_DISTRIBUTION" = "MySQL" ]] \
&& [[ $MYSQL_MAJOR_VERSION -eq 5 ]] \
&& [[ $MYSQL_MINOR_VERSION -le 6 ]] ); then
echo "## - Richte $MYSQL_DISTRIBUTION Systemtabellen ein" >> ${logdir}/main.log echo "## - Richte $MYSQL_DISTRIBUTION Systemtabellen ein" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log echo "## -" >> ${logdir}/main.log
@ -4932,7 +4935,10 @@ if ! $UPDATE_MYSQL ; then
## - Set root password ## - Set root password
## - ## -
if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]]; then if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]] \
|| ( [[ "$MYSQL_DISTRIBUTION" = "MySQL" ]] \
&& [[ $MYSQL_MAJOR_VERSION -eq 5 ]] \
&& [[ $MYSQL_MINOR_VERSION -le 6 ]] ); then
echononl "Setze root Passwort für den MySQL Zugang" echononl "Setze root Passwort für den MySQL Zugang"