Merge remote-tracking branch 'origin/master'

libraries/build_html_for_db.lib.php

@@ -49,11 +49,9 @@ function PMA_getColumnOrder()
         'format'    => 'byte',
         'footer'    => 0,
     );
-    $column_order['SCHEMA_DATA_FREE'] = array(
-        'disp_name' => __('Overhead'),
-        'format'    => 'byte',
-        'footer'    => 0,
-    );
+    // At this point we were preparing the display of Overhead using DATA_FREE
+    // but its content does not represent the real overhead in the case
+    // of InnoDB
 
     return $column_order;
 }

test/libraries/PMA_build_html_for_db_test.php

@@ -90,11 +90,6 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
                     'disp_name' => __('Total'),
                     'format'    => 'byte',
                     'footer'    => 0
-                ),
-                'SCHEMA_DATA_FREE' => array(
-                    'disp_name' => __('Overhead'),
-                    'format'    => 'byte',
-                    'footer'    => 0
                 )
             ),
             PMA_getColumnOrder()