From b5ebc13eb630dbf534f62a79989a662d1355d647 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Mon, 10 Dec 2018 16:29:35 +0100
Subject: [PATCH] install_mysql.sh: only one change in comment.

---
 install_mysql.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/install_mysql.sh b/install_mysql.sh
index d560300..9317251 100755
--- a/install_mysql.sh
+++ b/install_mysql.sh
@@ -2707,10 +2707,14 @@ socket		= $MYSQL_UNIX_SOCKET
 ## - sql_mode
 ## -
 ## - Since Version 8.0.11 NO_AUTO_CREATE_USER is no longer available
+## - 
+## - The default SQL mode in MySQL 8.0 includes these modes:  
+## -    ONLY_FULL_GROUP_BY, STRICT_TRANS_TABLES, NO_ZERO_IN_DATE, NO_ZERO_DATE,  
+## -    ERROR_FOR_DIVISION_BY_ZERO, and NO_ENGINE_SUBSTITUTION.
 ## -
 ## - For now, we will use the default value, it seems to be ok.
 ## -
-#sql-mode = \"ONLY_FULL_GROUP_BY,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION\"
+#sql-mode = \"ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\"
 " >> ${logdir}/main.log
 
    else
@@ -3567,10 +3571,14 @@ interactive-timeout
 ## - sql_mode
 ## -
 ## - Since Version 8.0.11 NO_AUTO_CREATE_USER is no longer available
+## - 
+## - The default SQL mode in MySQL 8.0 includes these modes:  
+## -    ONLY_FULL_GROUP_BY, STRICT_TRANS_TABLES, NO_ZERO_IN_DATE, NO_ZERO_DATE,  
+## -    ERROR_FOR_DIVISION_BY_ZERO, and NO_ENGINE_SUBSTITUTION.
 ## -
 ## - For now, we will use the default value, it seems to be ok.
 ## -
-#sql-mode = \"ONLY_FULL_GROUP_BY,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION\"
+#sql-mode = \"ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\"
 
 EOF" >> ${logdir}/main.log
 
@@ -5353,7 +5361,7 @@ if ! $UPDATE_MYSQL || $_sys_maint_cnf_needed ; then
          [[ $OK = "yes" ]] || fatal "Abbruch durch User"
       fi
 
-   fi # if [[ "$MYSQL_MAJOR_VERSION" -lt 8 ]]
+   fi # if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]]
 
    echononl "Give 'Grant' permission to MySQL User '${_maint_user}'.."
    echo "" >> ${logdir}/main.log