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

Merge pull request #6070 from 3D-I/ticket/16629

Browse Source 
[ticket/16629] Fix ACP get_database_size() for MySql 8
This commit is contained in:
Marc Alexander
2020-11-19 17:25:19 +01:00
parent fb525f7cdc cd235dfd42
commit 5197883379
2 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
phpBB/includes/functions_admin.php
View File

@@ -2832,56 +2832,34 @@ function view_warned_users(&$users, &$user_count, $limit = 0, $offset = 0, $limi
/**
* Get database size
* Currently only mysql and mssql are supported
*/
function get_database_size()
{
global $db, $user, $table_prefix;
global $db, $user;
$database_size = false;
// This code is heavily influenced by a similar routine in phpMyAdmin 2.2.0
switch ($db->get_sql_layer())
{
case 'mysqli':
$sql = 'SELECT VERSION() AS mysql_version';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$mysql_engine = ['MyISAM', 'InnoDB', 'Aria'];
if ($row)
$db_name = $db->get_db_name();
$sql = 'SHOW TABLE STATUS
FROM ' . $db_name;
$result = $db->sql_query($sql, 7200);
while ($row = $db->sql_fetchrow($result))
{
$version = $row['mysql_version'];
if (preg_match('#(3\.23|[45]\.|10\.[0-9]\.[0-9]{1,2}-+Maria)#', $version))
if (isset($row['Engine']) && in_array($row['Engine'], $mysql_engine))
{
$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;
$result = $db->sql_query($sql, 7200);
$database_size = 0;
while ($row = $db->sql_fetchrow($result))
{
if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB' || $row['Engine'] == 'Aria')))
{
if ($table_prefix != '')
{
if (strpos($row['Name'], $table_prefix) !== false)
{
$database_size += $row['Data_length'] + $row['Index_length'];
}
}
else
{
$database_size += $row['Data_length'] + $row['Index_length'];
}
}
}
$db->sql_freeresult($result);
$database_size += $row['Data_length'] + $row['Index_length'];
}
}
$db->sql_freeresult($result);
break;
case 'sqlite3':