diff --git a/ChangeLog b/ChangeLog index e9076cf30..8f77dc8d8 100755 --- a/ChangeLog +++ b/ChangeLog @@ -13,8 +13,11 @@ $Source$ libraries/common.lib.php3, libraries/config_import.lib.php3: Allow to supress dates in SQL dump separately. * lang/add_message.sh: Fail if no message specified. + * lang/add_message_file.sh: Fail if no file specified. * libraries/display_export.lib.php3: Added ugly hack to allow switching export options in Opera (bug #828712). + * db_details_structure.php3, lang/*: Show also overhead, allow to check + all tables with overhead at once (JS only) (RFE #828090). 2003-10-21 Marc Delisle * pdf_pages.php3: Patch 825672: show fields in Edit PDF scratchboard, diff --git a/db_details_structure.php3 b/db_details_structure.php3 index 08d2cb945..bb857cf7d 100644 --- a/db_details_structure.php3 +++ b/db_details_structure.php3 @@ -69,6 +69,7 @@ function pma_TableHeader($alternate = FALSE) { ' . $GLOBALS['strSize'] . ''; + echo '' . $GLOBALS['strOverhead'] . ''; } echo "\n"; ?> @@ -205,6 +206,8 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) { $i = $sum_entries = 0; (double) $sum_size = 0; + (double) $overhead_size = 0; + $overhead_check = ''; $checked = (!empty($checkall) ? ' checked="checked"' : ''); $num_columns = ($cfg['PropertiesNumColumns'] > 1 ? (ceil($num_tables / $cfg['PropertiesNumColumns']) + 1) : 0); $row_count = 0; @@ -318,6 +321,10 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) { $tblsize = doubleval($sts_data['Data_length']) + doubleval($sts_data['Index_length']); $sum_size += $tblsize; list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); + if (isset($sts_data['Data_free']) && $sts_data['Data_free'] > 0) { + list($formated_overhead, $overhead_unit) = PMA_formatByteDown($sts_data['Data_free']); + $overhead_size += $sts_data['Data_free']; + } } $sum_entries += $sts_data['Rows']; $display_rows = number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator); @@ -354,6 +361,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) { $formated_size = ' - '; $unit = ''; } + print_r($sts_data); $sum_entries += $sts_data['Rows']; $display_rows = number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator); } @@ -388,6 +396,18 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {    + +    + ' . $formated_overhead . ' ' . $overhead_unit . '' . "\n"; + unset($formated_overhead); + $overhead_check .= "document.getElementById('checkbox_tbl_$i').checked = true;"; + } else { + echo " - \n"; + } + ?> + = 32303) { // Show Summary if ($cfg['ShowStats']) { list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1); + list($overhead_formated, $overhead_unit) = PMA_formatByteDown($overhead_size, 3, 1); } echo "\n"; ?> @@ -436,6 +457,10 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {   + +   + + = 32303) {  /  + +  /  + + +