diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-16 23:18:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-16 23:18:13 +0100 |
| commit | 12a10de0d1b6ac053caa7689d4bb6f1ea437f0f1 (patch) | |
| tree | 4f043c5d64ac6ee981220a3c453021097aa65f85 /phpBB/includes/functions_admin.php | |
| parent | f34df97f8b8a6ae8ade4eeee6efc2bf4faf64e91 (diff) | |
| parent | b34dbc2e843e56be42813a50d6d1c1d3a7eead84 (diff) | |
| download | forums-12a10de0d1b6ac053caa7689d4bb6f1ea437f0f1.tar forums-12a10de0d1b6ac053caa7689d4bb6f1ea437f0f1.tar.gz forums-12a10de0d1b6ac053caa7689d4bb6f1ea437f0f1.tar.bz2 forums-12a10de0d1b6ac053caa7689d4bb6f1ea437f0f1.tar.xz forums-12a10de0d1b6ac053caa7689d4bb6f1ea437f0f1.zip | |
Merge pull request #4122 from lavigor/ticket/12441
[ticket/12441] Correct database size detection in MariaDB 10
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 33cf55cc0b..2b70d09fd5 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -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; |