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

This commit is contained in:
Marc Delisle
2008-05-08 01:30:22 +00:00
parent 0eab8db4a4
commit 9700406f52
2 changed files with 7 additions and 2 deletions

View File

@@ -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 = '<sup>1</sup>';
} 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 = '';