From 7e409e12525cfebe029ab4d10aa49657c8b1ec7a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 8 Jun 2009 12:04:35 +0000 Subject: [PATCH] bug #2802870 [display] Incorrect overhead value for InnoDB --- ChangeLog | 1 + tbl_structure.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f27915e0f1..2bc2ef05e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.2.1.0 (not yet released) - bug #2799009 Login with ipv6 IP address breaks redirect - bug #2796066 [priv] Inconsistent display of databases list +- bug #2802870 [display] Incorrect overhead value for InnoDB 3.2.0.0 (not yet released) - [core] better support for vendor customisation (based on what Debian needs) diff --git a/tbl_structure.php b/tbl_structure.php index 46a5e0d822..efc4ab28b0 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -608,7 +608,8 @@ if ($cfg['ShowStats']) { if ($mergetable == false) { list($index_size, $index_unit) = PMA_formatByteDown($showtable['Index_length'], $max_digits, $decimals); } - if (isset($showtable['Data_free']) && $showtable['Data_free'] > 0) { + // InnoDB returns a huge value in Data_free, do not use it + if (! $is_innodb && isset($showtable['Data_free']) && $showtable['Data_free'] > 0) { 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 { -- 2.11.4.GIT