From b3d78bbfdb1d9642abb2e5efc5ff056b5fe2703b Mon Sep 17 00:00:00 2001
From: dpeca <peca@mycity.rs>
Date: Thu, 5 Apr 2018 23:58:47 +0200
Subject: [PATCH] Avoiding IF NOT EXISTS for MariaDB 5.x in
 rebuild_mysql_database()

---
 func/rebuild.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/func/rebuild.sh b/func/rebuild.sh
index 7f63acf11..8cdc29f0e 100644
--- a/func/rebuild.sh
+++ b/func/rebuild.sh
@@ -536,8 +536,13 @@ rebuild_mysql_database() {
     mysql_connect $HOST
     mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null
     if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ] || [ "$mysql_fork" = "mariadb" ]; then
-        mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null
-        mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null
+        if [ "$mysql_fork" = "mariadb" ] && [ "$(echo $mysql_ver |cut -d '.' -f1)" -eq 5 ]; then
+            mysql_query "CREATE USER \`$DBUSER\`" > /dev/null
+            mysql_query "CREATE USER \`$DBUSER\`@localhost" > /dev/null
+        else
+            mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null
+            mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null
+        fi
         if [ "$mysql_fork" = "mariadb" ]; then
             query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
         else