github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit b3d78bbfdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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_connect $HOST
mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ] || [ "$mysql_fork" = "mariadb" ]; then if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ] || [ "$mysql_fork" = "mariadb" ]; then
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null if [ "$mysql_fork" = "mariadb" ] && [ "$(echo $mysql_ver |cut -d '.' -f1)" -eq 5 ]; then
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null 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 if [ "$mysql_fork" = "mariadb" ]; then
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'" query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
else else