Nemcio/VestaCP
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2026-07-11 11:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dpeca
2018-04-05 23:58:47 +02:00
committed by GitHub
parent 69f01fb227
commit b3d78bbfdb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
func/rebuild.sh
View File

@@ -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