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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Norman Hippert thanks to Norman Hippert
- bug #1939031 Auto_Increment selected for TimeStamp by Default - bug #1939031 Auto_Increment selected for TimeStamp by Default
- bug #1910621 [display] part 2: do not display a BINARY content as text - 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) 2.11.6.0 (2008-04-29)
- bug #1903724 [interface] Displaying of very large queries in error message - bug #1903724 [interface] Displaying of very large queries in error message

7
db_structure.php
View File

@@ -190,8 +190,11 @@ $sum_row_count_pre = '';
foreach ($tables as $keyname => $each_table) { foreach ($tables as $keyname => $each_table) {
if ($each_table['TABLE_ROWS'] === null || $each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) { 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_ROWS'] = PMA_Table::countRecords($db,
$each_table['TABLE_NAME'], $return = true, $force_exact = true); $each_table['TABLE_NAME'], $return = true, $force_exact = true);
} else {
$each_table['COUNTED'] = false;
} }
$table_encoded = urlencode($each_table['TABLE_NAME']); $table_encoded = urlencode($each_table['TABLE_NAME']);
@@ -367,8 +370,8 @@ foreach ($tables as $keyname => $each_table) {
$row_count_pre = '~'; $row_count_pre = '~';
$sum_row_count_pre = '~'; $sum_row_count_pre = '~';
$show_superscript = '<sup>1</sup>'; $show_superscript = '<sup>1</sup>';
} elseif($each_table['ENGINE'] == 'InnoDB') { } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) {
// InnoDB table: Row count is not accurate // InnoDB table: we did not get an accurate row count
$row_count_pre = '~'; $row_count_pre = '~';
$sum_row_count_pre = '~'; $sum_row_count_pre = '~';
$show_superscript = ''; $show_superscript = '';