Skip to content

Commit b3d78bb

Browse files
authored
Avoiding IF NOT EXISTS for MariaDB 5.x in rebuild_mysql_database()
1 parent 69f01fb commit b3d78bb

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

func/rebuild.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,13 @@ rebuild_mysql_database() {
536536
mysql_connect $HOST
537537
mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null
538538
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ] || [ "$mysql_fork" = "mariadb" ]; then
539-
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null
540-
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null
539+
if [ "$mysql_fork" = "mariadb" ] && [ "$(echo $mysql_ver |cut -d '.' -f1)" -eq 5 ]; then
540+
mysql_query "CREATE USER \`$DBUSER\`" > /dev/null
541+
mysql_query "CREATE USER \`$DBUSER\`@localhost" > /dev/null
542+
else
543+
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null
544+
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null
545+
fi
541546
if [ "$mysql_fork" = "mariadb" ]; then
542547
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
543548
else

0 commit comments

Comments
 (0)