diff --git a/ChangeLog b/ChangeLog
index 2b2398c91..cc74b5c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Virsacer - virsacer
 - [core] Fix broken cleanup of $_GET
 - bug #2924357 [operations] Cannot rename a database that has foreign key
-constraints
+  constraints
+- bug #869006 [structure] Ignore number of records for MRG_MyISAM tables
 
 3.2.4.0 (2009-12-02)
 - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status 
diff --git a/db_structure.php b/db_structure.php
index a05f3cb39..d28c47ebb 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -330,7 +330,7 @@ foreach ($tables as $keyname => $each_table) {
             }
             //$display_rows                   =  ' - ';
             break;
-        case 'MRG_MyISAM' :
+        case 'MRG_MYISAM' :
         case 'BerkeleyDB' :
             // Merge or BerkleyDB table: Only row count is accurate.
             if ($is_show_stats) {
@@ -358,7 +358,10 @@ foreach ($tables as $keyname => $each_table) {
                 $unit          =  '';
             }
     } // end switch
-    $sum_entries += $each_table['TABLE_ROWS'];
+
+    if ('MRG_MYISAM' != $each_table['ENGINE']) {
+        $sum_entries += $each_table['TABLE_ROWS'];
+    }
 
     if (isset($each_table['Collation'])) {
         $collation = '<dfn title="'