From f999c3fef3d418366815f4b771603afd927eae91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 23 Oct 2003 13:45:26 +0000 Subject: [PATCH] Show also overhead, allow to check all tables with overhead at once (JS only) (RFE #828090). --- ChangeLog | 3 ++ db_details_structure.php3 | 30 +++++++++++++++++++ lang/afrikaans-iso-8859-1.inc.php3 | 1 + lang/afrikaans-utf-8.inc.php3 | 1 + lang/albanian-iso-8859-1.inc.php3 | 1 + lang/albanian-utf-8.inc.php3 | 1 + lang/arabic-utf-8.inc.php3 | 1 + lang/arabic-windows-1256.inc.php3 | 1 + lang/azerbaijani-iso-8859-9.inc.php3 | 1 + lang/azerbaijani-utf-8.inc.php3 | 1 + lang/bosnian-utf-8.inc.php3 | 1 + lang/bosnian-windows-1250.inc.php3 | 1 + lang/brazilian_portuguese-iso-8859-1.inc.php3 | 1 + lang/brazilian_portuguese-utf-8.inc.php3 | 1 + lang/bulgarian-koi8-r.inc.php3 | 1 + lang/bulgarian-utf-8.inc.php3 | 1 + lang/bulgarian-windows-1251.inc.php3 | 1 + lang/catalan-iso-8859-1.inc.php3 | 1 + lang/catalan-utf-8.inc.php3 | 1 + lang/chinese_big5-utf-8.inc.php3 | 1 + lang/chinese_big5.inc.php3 | 1 + lang/chinese_gb-utf-8.inc.php3 | 1 + lang/chinese_gb.inc.php3 | 1 + lang/croatian-iso-8859-2.inc.php3 | 1 + lang/croatian-utf-8.inc.php3 | 1 + lang/croatian-windows-1250.inc.php3 | 1 + lang/czech-iso-8859-2.inc.php3 | 1 + lang/czech-utf-8.inc.php3 | 1 + lang/czech-windows-1250.inc.php3 | 1 + lang/danish-iso-8859-1.inc.php3 | 1 + lang/danish-utf-8.inc.php3 | 1 + lang/dutch-iso-8859-1.inc.php3 | 1 + lang/dutch-utf-8.inc.php3 | 1 + lang/english-iso-8859-1.inc.php3 | 1 + lang/english-utf-8.inc.php3 | 1 + lang/estonian-iso-8859-1.inc.php3 | 1 + lang/estonian-utf-8.inc.php3 | 1 + lang/finnish-iso-8859-1.inc.php3 | 1 + lang/finnish-utf-8.inc.php3 | 1 + lang/french-iso-8859-1.inc.php3 | 1 + lang/french-utf-8.inc.php3 | 1 + lang/galician-iso-8859-1.inc.php3 | 1 + lang/galician-utf-8.inc.php3 | 1 + lang/georgian-utf-8.inc.php3 | 1 + lang/german-iso-8859-1.inc.php3 | 1 + lang/german-utf-8.inc.php3 | 1 + lang/greek-iso-8859-7.inc.php3 | 1 + lang/greek-utf-8.inc.php3 | 1 + lang/hebrew-iso-8859-8-i.inc.php3 | 1 + lang/hindi-utf-8.inc.php3 | 1 + lang/hungarian-iso-8859-2.inc.php3 | 1 + lang/hungarian-utf-8.inc.php3 | 1 + lang/indonesian-iso-8859-1.inc.php3 | 1 + lang/indonesian-utf-8.inc.php3 | 1 + lang/italian-iso-8859-1.inc.php3 | 1 + lang/italian-utf-8.inc.php3 | 1 + lang/japanese-euc.inc.php3 | 1 + lang/japanese-sjis.inc.php3 | 1 + lang/japanese-utf-8.inc.php3 | 1 + lang/korean-ks_c_5601-1987.inc.php3 | 1 + lang/latvian-utf-8.inc.php3 | 1 + lang/latvian-windows-1257.inc.php3 | 1 + lang/lithuanian-utf-8.inc.php3 | 1 + lang/lithuanian-windows-1257.inc.php3 | 1 + lang/malay-iso-8859-1.inc.php3 | 1 + lang/malay-utf-8.inc.php3 | 1 + lang/norwegian-iso-8859-1.inc.php3 | 1 + lang/norwegian-utf-8.inc.php3 | 1 + lang/persian-utf-8.inc.php3 | 1 + lang/persian-windows-1256.inc.php3 | 1 + lang/polish-iso-8859-2.inc.php3 | 1 + lang/polish-utf-8.inc.php3 | 1 + lang/portuguese-iso-8859-1.inc.php3 | 1 + lang/portuguese-utf-8.inc.php3 | 1 + lang/romanian-iso-8859-1.inc.php3 | 1 + lang/romanian-utf-8.inc.php3 | 1 + lang/russian-dos-866.inc.php3 | 1 + lang/russian-koi8-r.inc.php3 | 1 + lang/russian-utf-8.inc.php3 | 1 + lang/russian-windows-1251.inc.php3 | 1 + lang/serbian_cyrillic-utf-8.inc.php3 | 1 + lang/serbian_cyrillic-windows-1251.inc.php3 | 1 + lang/serbian_latin-utf-8.inc.php3 | 1 + lang/serbian_latin-windows-1250.inc.php3 | 1 + lang/slovak-iso-8859-2.inc.php3 | 1 + lang/slovak-utf-8.inc.php3 | 1 + lang/slovak-windows-1250.inc.php3 | 1 + lang/slovenian-iso-8859-2.inc.php3 | 1 + lang/slovenian-utf-8.inc.php3 | 1 + lang/slovenian-windows-1250.inc.php3 | 1 + lang/spanish-iso-8859-1.inc.php3 | 1 + lang/spanish-utf-8.inc.php3 | 1 + lang/swedish-iso-8859-1.inc.php3 | 1 + lang/swedish-utf-8.inc.php3 | 1 + lang/thai-tis-620.inc.php3 | 1 + lang/thai-utf-8.inc.php3 | 1 + lang/turkish-iso-8859-9.inc.php3 | 1 + lang/turkish-utf-8.inc.php3 | 1 + lang/ukrainian-utf-8.inc.php3 | 1 + lang/ukrainian-windows-1251.inc.php3 | 1 + 100 files changed, 131 insertions(+) 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) {  /  + +  /  + + +