mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MySQL 4 byte is now detected during setup in any case. 

config.sample.php was updated to explicitly state that there detection in place to set mysql.utf8mb4
This commit is contained in:
Thomas Müller 2017-03-21 13:08:14 +01:00 committed by Roeland Jago Douma
parent 43427e26d7
commit 86ccc8949f
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.sample.php
View File

@ -1234,8 +1234,12 @@ $CONFIG = array(
'sqlite.journal_mode' => 'DELETE',
/**
* If this setting is set to true MySQL can handle 4 byte characters instead of
* 3 byte characters
* If requirements are met (see below) this setting is set to true during setup
* and MySQL can handle 4 byte characters instead of 3 byte characters.
*
* If you want to convert a 3-byte setup into a 4-byte setup please run the
* migration command:
* ./occ db:convert-mysql-charset
*
* MySQL requires a special setup for longer indexes (> 767 bytes) which are
* needed:

2
lib/private/Setup/MySQL.php
View File

@ -38,13 +38,11 @@ class MySQL extends AbstractDatabase {
$connection = $this->connect(['dbname' => null]);
// detect mb4
if (is_null($this->config->getValue('mysql.utf8mb4', null))) {
$tools = new MySqlTools();
if ($tools->supports4ByteCharset($connection)) {
$this->config->setValue('mysql.utf8mb4', true);
$connection = $this->connect();
}
}
$this->createSpecificUser($username, $connection);