diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-10 11:09:03 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-10 11:09:03 +0100 |
| commit | 45d07906b84680685da31e97dcd102bbd932f047 (patch) | |
| tree | d51cb665f8098223bb55ff9ad61d26cc2e84ccdc /lib | |
| parent | 8c7fb64b8b11e878de31d1e3f291672196b1899f (diff) | |
| parent | dbec143f09f32832a52fb507ababb84518721370 (diff) | |
| download | nextcloud-server-45d07906b84680685da31e97dcd102bbd932f047.tar.gz nextcloud-server-45d07906b84680685da31e97dcd102bbd932f047.zip | |
Merge pull request #7131 from owncloud/issue/6269
Change MySQL to MariaDB/MySQL in the frontend
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/setup/mysql.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php index d97b6d2602f..b2c28173b1c 100644 --- a/lib/private/setup/mysql.php +++ b/lib/private/setup/mysql.php @@ -3,13 +3,13 @@ namespace OC\Setup; class MySQL extends AbstractDatabase { - public $dbprettyname = 'MySQL'; + public $dbprettyname = 'MySQL/MariaDB'; public function setupDatabase($username) { //check if the database user has admin right $connection = @mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword); if(!$connection) { - throw new \DatabaseSetupException($this->trans->t('MySQL username and/or password not valid'), + throw new \DatabaseSetupException($this->trans->t('MySQL/MariaDB username and/or password not valid'), $this->trans->t('You need to enter either an existing account or the administrator.')); } $oldUser=\OC_Config::getValue('dbuser', false); @@ -82,14 +82,14 @@ class MySQL extends AbstractDatabase { $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'"; $result = mysql_query($query, $connection); if (!$result) { - throw new \DatabaseSetupException($this->trans->t("MySQL user '%s'@'localhost' exists already.", array($name)), - $this->trans->t("Drop this user from MySQL", array($name))); + throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'localhost' exists already.", array($name)), + $this->trans->t("Drop this user from MySQL/MariaDB", array($name))); } $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; $result = mysql_query($query, $connection); if (!$result) { - throw new \DatabaseSetupException($this->trans->t("MySQL user '%s'@'%%' already exists", array($name)), - $this->trans->t("Drop this user from MySQL.")); + throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'%%' already exists", array($name)), + $this->trans->t("Drop this user from MySQL/MariaDB.")); } } } |