diff --git a/db_details.php3 b/db_details.php3 index 782774688..348a743a3 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -129,10 +129,11 @@ else if (MYSQL_MAJOR_VERSION >= 3.23 && isset($tbl_cache)) { = 3.23 && isset($tbl_cache)) { list($formated_size, $unit) = format_byte_down($tblsize, 3, 0); } } - else if (isset($mergetable)) // MyISAM MERGE Table + else if ($mergetable == true) // MyISAM MERGE Table { $formated_size=" - "; $unit=""; @@ -155,10 +156,10 @@ else if (MYSQL_MAJOR_VERSION >= 3.23 && isset($tbl_cache)) { ?> "; + if ($mergetable == true) echo ""; echo number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . "\n"; - if (isset($mergetable)) echo ""; + if ($mergetable == true) echo ""; ?> diff --git a/tbl_properties.php3 b/tbl_properties.php3 index 4f62dcd8a..459b3e537 100755 --- a/tbl_properties.php3 +++ b/tbl_properties.php3 @@ -268,11 +268,12 @@ if ($index_count > 0) { // BEGIN - Calc Table Space - staybyte - 9 June 2001 if (MYSQL_MAJOR_VERSION >= 3.23 && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_type != "INNODB" && isset($showtable)) { // Gets some sizes - if (isset($showtable['Type']) && $showtable['Type']=="MRG_MyISAM") - $mergetable=true; + $mergetable=false; + if (isset($showtable['Type']) && $showtable['Type']=="MRG_MyISAM") $mergetable=true; list($data_size, $data_unit) = format_byte_down($showtable['Data_length']); - if (!isset($mergetable)) - list($index_size, $index_unit) = format_byte_down($showtable['Index_length']); + + if ($mergetable==false) list($index_size, $index_unit) = format_byte_down($showtable['Index_length']); + if (isset($showtable['Data_free']) && $showtable['Data_free'] > 0) { list($free_size, $free_unit) = format_byte_down($showtable['Data_free']); } @@ -328,6 +329,7 @@ if (MYSQL_MAJOR_VERSION >= 3.23 && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_type @@ -335,6 +337,8 @@ if (MYSQL_MAJOR_VERSION >= 3.23 && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_type = 3.23 && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_type 0 - && !isset($mergetable)) { + if (isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable==false) { echo (++$i%2) ? ' ' : ' ';