Merge remote-tracking branch 'nextcloud/master'

Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index d1399c8821c..bafb3866b76 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -35,7 +35,7 @@ class MySQL extends AbstractDatabase {
 
 	public function setupDatabase($username) {
 		//check if the database user has admin right
-		$connection = $this->connect();
+		$connection = $this->connect(['dbname' => null]);
 
 		$this->createSpecificUser($username, $connection);
 
@@ -152,7 +152,7 @@ class MySQL extends AbstractDatabase {
 				};
 			}
 		} catch (\Exception $ex) {
-			$this->logger->error('Specific user creation failed: {error}', [
+			$this->logger->info('Can not create a new MySQL user, will continue with the provided user: {error}', [
 				'app' => 'mysql.setup',
 				'error' => $ex->getMessage()
 			]);