diff --git a/db_details.php3 b/db_details.php3 index 0b9a0d208..3383ec605 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -129,42 +129,43 @@ else if (MYSQL_MAJOR_VERSION >= 3.23 && isset($tbl_cache)) { 0) { - list($formated_size, $unit) = format_byte_down($tblsize, 3, 1); - } else { - list($formated_size, $unit) = format_byte_down($tblsize, 3, 0); + $mergetable = FALSE; + $nonisam = FALSE; + if (isset($sts_data['Type'])) { + if ($sts_data['Type'] == 'MRG_MyISAM') { + $mergetable = TRUE; + } else if (!eregi('ISAM|HEAP', $sts_data['Type'])) { + $nonisam = TRUE; + } } - } - else { - $formated_size=" - "; - $unit=""; - } - if (isset($sts_data['Rows'])) $sum_entries += $sts_data['Rows']; - } - // MyISAM MERGE Table - else if ($mergetable == true) - { - $formated_size=" - "; - $unit=""; - } - else - { - $formated_size="unknown"; - $unit=""; - } + + if (isset($sts_data['Rows'])) { + if ($mergetable == FALSE) { + if ($nonisam == FALSE) { + $tblsize = $sts_data['Data_length'] + $sts_data['Index_length']; + $sum_size += $tblsize; + if ($tblsize > 0) { + list($formated_size, $unit) = format_byte_down($tblsize, 3, 1); + } else { + list($formated_size, $unit) = format_byte_down($tblsize, 3, 0); + } + } else { + $formated_size = ' - '; + $unit = ''; + } + if (isset($sts_data['Rows'])) { + $sum_entries += $sts_data['Rows']; + } + } + // MyISAM MERGE Table + else if ($mergetable == TRUE) { + $formated_size = ' - '; + $unit = ''; + } + else { + $formated_size = 'unknown'; + $unit = ''; + } ?>