From 011fe9e0f9f4cc67bdee9138721425ae1df297f9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 9 Jul 2018 15:34:42 +0200 Subject: [PATCH] MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default Signed-off-by: Joas Schilling --- lib/private/DB/MySqlTools.php | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/lib/private/DB/MySqlTools.php b/lib/private/DB/MySqlTools.php index 7f0ba47326..b67aaffe5b 100644 --- a/lib/private/DB/MySqlTools.php +++ b/lib/private/DB/MySqlTools.php @@ -34,17 +34,36 @@ class MySqlTools { * @return bool */ public function supports4ByteCharset(IDBConnection $connection) { - foreach (['innodb_file_format' => 'Barracuda', 'innodb_large_prefix' => 'ON', 'innodb_file_per_table' => 'ON'] as $var => $val) { + $variables = ['innodb_file_per_table' => 'ON']; + if (!$this->isMariaDBWithLargePrefix($connection)) { + $variables['innodb_file_format'] = 'Barracuda'; + $variables['innodb_large_prefix'] = 'ON'; + } + + foreach ($variables as $var => $val) { $result = $connection->executeQuery("SHOW VARIABLES LIKE '$var'"); - $rows = $result->fetch(); + $row = $result->fetch(); $result->closeCursor(); - if ($rows === false) { + if ($row === false) { return false; } - if (strcasecmp($rows['Value'], $val) !== 0) { + if (strcasecmp($row['Value'], $val) !== 0) { return false; } } return true; } + + protected function isMariaDBWithLargePrefix(IDBConnection $connection) { + $result = $connection->executeQuery('SELECT VERSION()'); + $row = strtolower($result->fetchColumn()); + $result->closeCursor(); + + if ($row === false) { + return false; + } + + return strpos($row, 'maria') && version_compare($row, '10.3', '>=') || + strpos($row, 'maria') === false && version_compare($row, '8.0', '>='); + } }