mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 19:49:20 +02:00
Code Issues Releases Wiki Activity

[ticket/12441] Correct database size detection in MariaDB 10

Browse Source 
PHPBB3-12441
This commit is contained in:
lavigor 2016-01-14 11:30:45 +03:00
parent f979d2c7b2
commit b34dbc2e84
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_admin.php
View File

@ -3101,9 +3101,9 @@ function get_database_size()
{
$version = $row['mysql_version'];
if (preg_match('#(3\.23|[45]\.)#', $version))
if (preg_match('#(3\.23|[45]\.|10\.[0-9]\.[0-9]{1,2}-+Maria)#', $version))
{
$db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.#', $version)) ? "`{$db->get_db_name()}`" : $db->get_db_name();
$db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.|10\.[0-9]\.[0-9]{1,2}-+Maria#', $version)) ? "`{$db->get_db_name()}`" : $db->get_db_name();
$sql = 'SHOW TABLE STATUS
FROM ' . $db_name;