nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1412058, damaged table reporting

Browse Source
This commit is contained in:
Marc Delisle
2006-01-31 18:44:07 +00:00
parent 4a470bb142
commit 3e20c7cb5f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2006-01-30 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: bug #1418145, missing global, * libraries/common.lib.php: bug #1418145, missing global,
thanks to Bananeweizen thanks to Bananeweizen

10
db_details_structure.php
View File

@@ -220,6 +220,7 @@ foreach ( $tables as $keyname => $each_table ) {
// loic1: Patch from Joshua Nye <josh at boxcarmedia.com> to get valid // loic1: Patch from Joshua Nye <josh at boxcarmedia.com> to get valid
// statistics whatever is the table type // statistics whatever is the table type
if ( isset( $each_table['TABLE_ROWS'] ) ) { if ( isset( $each_table['TABLE_ROWS'] ) ) {
// MyISAM, ISAM or Heap table: Row count, data size and index size // MyISAM, ISAM or Heap table: Row count, data size and index size
// is accurate. // is accurate.
@@ -281,7 +282,7 @@ foreach ( $tables as $keyname => $each_table ) {
$overhead = '-'; $overhead = '-';
} }
} // end if } // end if
} } // end if ( isset( $each_table['TABLE_ROWS'] )
if ( $num_columns > 0 && $num_tables > $num_columns if ( $num_columns > 0 && $num_tables > $num_columns
&& ( ($row_count % $num_columns) == 0 )) { && ( ($row_count % $num_columns) == 0 )) {
@@ -320,8 +321,11 @@ foreach ( $tables as $keyname => $each_table ) {
echo urlencode($drop_message); ?>" echo urlencode($drop_message); ?>"
onclick="return confirmLink(this, '<?php echo PMA_jsFormat($drop_query, FALSE); ?>')"> onclick="return confirmLink(this, '<?php echo PMA_jsFormat($drop_query, FALSE); ?>')">
<?php echo $titles['Drop']; ?></a></td> <?php echo $titles['Drop']; ?></a></td>
<?php } // end if ( ! $db_is_information_schema ) ?> <?php } // end if ( ! $db_is_information_schema )
<?php if ( isset( $each_table['TABLE_ROWS'] ) ) { ?>
// 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> <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)) { ?> <?php if (!($cfg['PropertiesNumColumns'] > 1)) { ?>
<td nowrap="nowrap"><?php echo $each_table['ENGINE']; ?></td> <td nowrap="nowrap"><?php echo $each_table['ENGINE']; ?></td>