From 9700406f52e597b29065d68a1f61ff99cf692f49 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 8 May 2008 01:30:22 +0000 Subject: [PATCH] patch #1957998 [display] No tilde for InnoDB row counter when we know it for sure; also, fix in trunk a problem where "In use" was always displayed for views --- ChangeLog | 2 ++ db_structure.php | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 807fec0c6..2fb3422bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Norman Hippert - bug #1939031 Auto_Increment selected for TimeStamp by Default - bug #1910621 [display] part 2: do not display a BINARY content as text +- patch #1957998 [display] No tilde for InnoDB row counter when we know + it for sure, thanks to Vladyslav Bakayev - dandy76 2.11.6.0 (2008-04-29) - bug #1903724 [interface] Displaying of very large queries in error message diff --git a/db_structure.php b/db_structure.php index 85605d224..ad6070d4d 100644 --- a/db_structure.php +++ b/db_structure.php @@ -190,8 +190,11 @@ $sum_row_count_pre = ''; foreach ($tables as $keyname => $each_table) { if ($each_table['TABLE_ROWS'] === null || $each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) { + $each_table['COUNTED'] = true; $each_table['TABLE_ROWS'] = PMA_Table::countRecords($db, $each_table['TABLE_NAME'], $return = true, $force_exact = true); + } else { + $each_table['COUNTED'] = false; } $table_encoded = urlencode($each_table['TABLE_NAME']); @@ -367,8 +370,8 @@ foreach ($tables as $keyname => $each_table) { $row_count_pre = '~'; $sum_row_count_pre = '~'; $show_superscript = '1'; - } elseif($each_table['ENGINE'] == 'InnoDB') { - // InnoDB table: Row count is not accurate + } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) { + // InnoDB table: we did not get an accurate row count $row_count_pre = '~'; $sum_row_count_pre = '~'; $show_superscript = '';