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

patch #2561433 [structure] Display true number of rows in a view if it contains less than MaxExactCountViews

Browse Source
This commit is contained in:
Marc Delisle
2009-02-04 21:24:13 +00:00
parent 5b379a3e81
commit f53c233277
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -39,6 +39,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ [lang] Mongolian update, thanks to Bayarsaikhan Enkhtaivan - bayaraa + [lang] Mongolian update, thanks to Bayarsaikhan Enkhtaivan - bayaraa
- patch #2553372 [display] DB comment tooltips not shown on navi, - patch #2553372 [display] DB comment tooltips not shown on navi,
thanks to Erdem - ahard thanks to Erdem - ahard
- patch #2561433 [structure] Display true number of rows in a view
if it contains less than MaxExactCountViews,
thanks to Virsacer - virsacer
3.1.2.0 (2009-01-19) 3.1.2.0 (2009-01-19)
- bug #1253252 [display] Can't NULL a column with relation defined - bug #1253252 [display] Can't NULL a column with relation defined

8
db_structure.php
View File

@@ -453,9 +453,11 @@ foreach ($tables as $keyname => $each_table) {
// that needs to be repaired // that needs to be repaired
if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) { if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) {
if ($table_is_view) { if ($table_is_view) {
$row_count_pre = '~'; if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']){
$sum_row_count_pre = '~'; $row_count_pre = '~';
$show_superscript = PMA_showHint(PMA_sanitize(sprintf($strViewHasAtLeast, '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]'))); $sum_row_count_pre = '~';
$show_superscript = PMA_showHint(PMA_sanitize(sprintf($strViewHasAtLeast, '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]')));
}
} elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) { } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) {
// InnoDB table: we did not get an accurate row count // InnoDB table: we did not get an accurate row count
$row_count_pre = '~'; $row_count_pre = '~';