1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:24:31 +02:00

Fixed problem with SHOW TABLE STATUS (bad MySQL config) #501745

git-svn-id: file:///svn/phpbb/trunk@1840 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Bart van Bragt
2002-01-11 10:26:52 +00:00
parent d728809a4c
commit 4c3a11f577

View File

@ -235,43 +235,42 @@ elseif( $HTTP_GET_VARS['pane'] == 'right' )
$sql = "SHOW TABLE STATUS
FROM " . $db_name;
if(!$result = $db->sql_query($sql))
if($result = $db->sql_query($sql))
{
message_die(GENERAL_ERROR, "Couldn't obtain table information.", "", __LINE__, __FILE__, $sql);
}
$tabledata_ary = $db->sql_fetchrowset($result);
$tabledata_ary = $db->sql_fetchrowset($result);
$dbsize = 0;
for($i = 0; $i < count($tabledata_ary); $i++)
{
if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" )
$dbsize = 0;
for($i = 0; $i < count($tabledata_ary); $i++)
{
if( $table_prefix != "" )
if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" )
{
if( strstr($tabledata_ary[$i]['Name'], $table_prefix) )
if( $table_prefix != "" )
{
if( strstr($tabledata_ary[$i]['Name'], $table_prefix) )
{
$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
}
}
else
{
$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
}
}
else
{
$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
}
}
}
if( $dbsize >= 1048576 )
{
$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
}
else if( $dbsize >= 1024 )
{
$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
}
else
{
$dbsize = sprintf("%.2f Bytes", $dbsize);
}
if( $dbsize >= 1048576 )
{
$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
}
else if( $dbsize >= 1024 )
{
$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
}
else
{
$dbsize = sprintf("%.2f Bytes", $dbsize);
}
} // Else we couldn't get the table status.
}
else
{
@ -568,4 +567,4 @@ else
}
?>
?>