From 512975e91cfbb603952690ac2e1926d031174b6c Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 3 Jan 2010 16:27:46 +0000
Subject: [PATCH] bug #869006 Ignore number of records for MRG_MyISAM

---
 ChangeLog        | 3 ++-
 db_structure.php | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f699aaaf8c..6fc58f0561 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,7 +65,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 8f81a23aa0..75078d79d3 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -226,7 +226,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) {
@@ -254,7 +254,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="'
-- 
2.11.4.GIT