summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-11-20 21:51:16 +0100
committerGitHub <noreply@github.com>2019-11-20 21:51:16 +0100
commit2eb24fcf420acae5f62e7a4d8190b74d9c701d0f (patch)
tree438a1312d3f3134dc0eb68090e87cf72eef82cd5
parente358d79114ae7a17e418385e75130d56e5dc7fb5 (diff)
parent77d814d35f4db0cdff8b88542c31f268a76fec71 (diff)
downloadnextcloud-server-2eb24fcf420acae5f62e7a4d8190b74d9c701d0f.tar.gz
nextcloud-server-2eb24fcf420acae5f62e7a4d8190b74d9c701d0f.zip
Merge pull request #18009 from nextcloud/bugfix/noid/install-with-mysql-8.0.4+
Fix installing with MySQL 8.0.4+
-rw-r--r--lib/private/Setup/MySQL.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index eb4fedefd4b..3bb940186f8 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -100,9 +100,9 @@ class MySQL extends AbstractDatabase {
$password = $this->dbPassword;
// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
// the anonymous user would take precedence when there is one.
- $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
+ $query = "CREATE USER '$name'@'localhost' IDENTIFIED WITH mysql_native_password BY '$password'";
$connection->executeUpdate($query);
- $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
+ $query = "CREATE USER '$name'@'%' IDENTIFIED WITH mysql_native_password BY '$password'";
$connection->executeUpdate($query);
}
catch (\Exception $ex){