From 3e20c7cb5feee48d67dc04af69c308b231e980f0 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 31 Jan 2006 18:44:07 +0000
Subject: [PATCH] bug #1412058, damaged table reporting

---
 ChangeLog                |  3 +++
 db_details_structure.php | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c88e1f32..a875cd2c7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-01-31 Marc Delisle  <lem9@users.sourceforge.net>
+    * db_details_structure.php: bug #1412058, damaged table reporting
+
 2006-01-30 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1418145, missing global,
           thanks to Bananeweizen
diff --git a/db_details_structure.php b/db_details_structure.php
index 79684fe7f..d0018187c 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -220,6 +220,7 @@ foreach ( $tables as $keyname => $each_table ) {
 
     // loic1: Patch from Joshua Nye <josh at boxcarmedia.com> to get valid
     //        statistics whatever is the table type
+
     if ( isset( $each_table['TABLE_ROWS'] ) ) {
         // MyISAM, ISAM or Heap table: Row count, data size and index size
         // is accurate.
@@ -281,7 +282,7 @@ foreach ( $tables as $keyname => $each_table ) {
                 $overhead = '-';
             }
         } // end if
-    }
+    } // end if ( isset( $each_table['TABLE_ROWS'] )
 
     if ( $num_columns > 0 && $num_tables > $num_columns
       && ( ($row_count % $num_columns) == 0 )) {
@@ -320,8 +321,11 @@ foreach ( $tables as $keyname => $each_table ) {
             echo urlencode($drop_message); ?>"
             onclick="return confirmLink(this, '<?php echo PMA_jsFormat($drop_query, FALSE); ?>')">
             <?php echo $titles['Drop']; ?></a></td>
-    <?php } // end if ( ! $db_is_information_schema ) ?>
-    <?php if ( isset( $each_table['TABLE_ROWS'] ) ) { ?>
+    <?php } // end if ( ! $db_is_information_schema )
+
+    // there is a null value in the ENGINE when the table needs to be
+    // repaired, so this test ensures that we'll display "in use" 
+    if (isset($each_table['TABLE_ROWS']) && $each_table['ENGINE'] != null) { ?>
     <td class="value"><?php echo PMA_formatNumber( $each_table['TABLE_ROWS'], 0 ) . ($table_is_view  && $each_table['TABLE_ROWS'] >= $cfg['MaxExactCount'] ? '<sup>1</sup>' : ''); ?></td>
         <?php if (!($cfg['PropertiesNumColumns'] > 1)) { ?>
     <td nowrap="nowrap"><?php echo $each_table['ENGINE']; ?></td>