From 713dfc4929ed063bd5bad6e63d7d6b11f78bb597 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 8 Feb 2008 20:47:31 +0000
Subject: [PATCH] bug #1884911 [GUI] Space usage

---
 ChangeLog         |  1 +
 tbl_structure.php | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1462f3f5b..d92f0b2fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug [import] Do not verify a missing enclosing character for CSV,
   because files generated by Excel don't have any enclosing character
 - bug #1799691 [export] "Propose table structure" and Export
+- bug #1884911 [GUI] Space usage
 
 2.11.4.0 (2008-01-12)
 - bug #1843428 [GUI] Space issue with DROP/DELETE/ALTER TABLE
diff --git a/tbl_structure.php b/tbl_structure.php
index 9e1adb577..2d25bfb3d 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -579,17 +579,20 @@ if ($cfg['ShowStats']) {
     if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') {
         $mergetable = true;
     }
-    list($data_size, $data_unit)         = PMA_formatByteDown($showtable['Data_length']);
+    // this is to display for example 261.2 MiB instead of 268k KiB
+    $max_digits = 5;
+    $decimals = 1;
+    list($data_size, $data_unit)         = PMA_formatByteDown($showtable['Data_length'], $max_digits, $decimals);
     if ($mergetable == false) {
-        list($index_size, $index_unit)   = PMA_formatByteDown($showtable['Index_length']);
+        list($index_size, $index_unit)   = PMA_formatByteDown($showtable['Index_length'], $max_digits, $decimals);
     }
     if (isset($showtable['Data_free']) && $showtable['Data_free'] > 0) {
-        list($free_size, $free_unit)     = PMA_formatByteDown($showtable['Data_free']);
-        list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free']);
+        list($free_size, $free_unit)     = PMA_formatByteDown($showtable['Data_free'], $max_digits, $decimals);
+        list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free'], $max_digits, $decimals);
     } else {
-        list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']);
+        list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'], $max_digits, $decimals);
     }
-    list($tot_size, $tot_unit)           = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']);
+    list($tot_size, $tot_unit)           = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'], $max_digits, $decimals);
     if ($table_info_num_rows > 0) {
         list($avg_size, $avg_unit)       = PMA_formatByteDown(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows'], 6, 1);
     }