nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1445853, overhead should not display the exact number of bytes

Browse Source
This commit is contained in:
Marc Delisle
2006-03-19 12:19:34 +00:00
parent 2af02bc0a0
commit 04deb1a925
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
db_details_structure.php
View File

@@ -246,9 +246,9 @@ foreach ($tables as $keyname => $each_table) {
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
$tblsize = doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']); $tblsize = doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']);
$sum_size += $tblsize; $sum_size += $tblsize;
list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0);
if (isset($each_table['Data_free']) && $each_table['Data_free'] > 0) { if (isset($each_table['Data_free']) && $each_table['Data_free'] > 0) {
list($formated_overhead, $overhead_unit) = PMA_formatByteDown($each_table['Data_free']); list($formatted_overhead, $overhead_unit) = PMA_formatByteDown($each_table['Data_free'], 3, ($each_table['Data_free'] > 0) ? 1 : 0);
$overhead_size += $each_table['Data_free']; $overhead_size += $each_table['Data_free'];
} }
} }
@@ -259,21 +259,21 @@ foreach ($tables as $keyname => $each_table) {
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
$tblsize = $each_table['Data_length'] + $each_table['Index_length']; $tblsize = $each_table['Data_length'] + $each_table['Index_length'];
$sum_size += $tblsize; $sum_size += $tblsize;
list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0);
} }
//$display_rows = ' - '; //$display_rows = ' - ';
$sum_entries += $each_table['TABLE_ROWS']; $sum_entries += $each_table['TABLE_ROWS'];
} elseif (preg_match('@^(MRG_MyISAM|BerkeleyDB)$@', $each_table['ENGINE'])) { } elseif (preg_match('@^(MRG_MyISAM|BerkeleyDB)$@', $each_table['ENGINE'])) {
// Merge or BerkleyDB table: Only row count is accurate. // Merge or BerkleyDB table: Only row count is accurate.
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
$formated_size = ' - '; $formatted_size = ' - ';
$unit = ''; $unit = '';
} }
$sum_entries += $each_table['TABLE_ROWS']; $sum_entries += $each_table['TABLE_ROWS'];
} else { } else {
// Unknown table type. // Unknown table type.
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
$formated_size = 'unknown'; $formatted_size = 'unknown';
$unit = ''; $unit = '';
} }
} }
@@ -289,11 +289,11 @@ foreach ($tables as $keyname => $each_table) {
} }
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
if (isset($formated_overhead)) { if (isset($formatted_overhead)) {
$overhead = '<a href="tbl_properties_structure.php?' $overhead = '<a href="tbl_properties_structure.php?'
. $tbl_url_query . '#showusage">' . $formated_overhead . $tbl_url_query . '#showusage">' . $formatted_overhead
. ' ' . $overhead_unit . '</a>' . "\n"; . ' ' . $overhead_unit . '</a>' . "\n";
unset($formated_overhead); unset($formatted_overhead);
$overhead_check .= $overhead_check .=
"document.getElementById('checkbox_tbl_$i').checked = true;"; "document.getElementById('checkbox_tbl_$i').checked = true;";
} else { } else {
@@ -366,7 +366,7 @@ foreach ($tables as $keyname => $each_table) {
<?php if ($cfg['ShowStats']) { ?> <?php if ($cfg['ShowStats']) { ?>
<td class="value"><a <td class="value"><a
href="tbl_properties_structure.php?<?php echo $tbl_url_query; ?>#showusage" href="tbl_properties_structure.php?<?php echo $tbl_url_query; ?>#showusage"
><?php echo $formated_size . ' ' . $unit; ?></a></td> ><?php echo $formatted_size . ' ' . $unit; ?></a></td>
<td class="value"><?php echo $overhead; ?></td> <td class="value"><?php echo $overhead; ?></td>
<?php } // end if ?> <?php } // end if ?>
<?php } elseif ($table_is_view) { ?> <?php } elseif ($table_is_view) { ?>
@@ -388,8 +388,8 @@ foreach ($tables as $keyname => $each_table) {
// Show Summary // Show Summary
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1); list($sum_formatted, $unit) = PMA_formatByteDown($sum_size, 3, 1);
list($overhead_formated, $overhead_unit) = list($overhead_formatted, $overhead_unit) =
PMA_formatByteDown($overhead_size, 3, 1); PMA_formatByteDown($overhead_size, 3, 1);
} }
?> ?>
@@ -416,8 +416,8 @@ if (!($cfg['PropertiesNumColumns'] > 1)) {
if ($cfg['ShowStats']) { if ($cfg['ShowStats']) {
?> ?>
<th class="value"><?php echo $sum_formated . ' ' . $unit; ?></th> <th class="value"><?php echo $sum_formatted . ' ' . $unit; ?></th>
<th class="value"><?php echo $overhead_formated . ' ' . $overhead_unit; ?></th> <th class="value"><?php echo $overhead_formatted . ' ' . $overhead_unit; ?></th>
<?php <?php
} }
?> ?>