Explorar o código

Avoiding IF NOT EXISTS for MariaDB 5.x in rebuild_mysql_database()

dpeca %!s(int64=7) %!d(string=hai) anos
pai
achega
b3d78bbfdb
Modificáronse 1 ficheiros con 7 adicións e 2 borrados
  1. 7 2
      func/rebuild.sh

+ 7 - 2
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