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

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Marc Delisle
2010-03-12 17:16:58 -05:00
parent c4bdb18703 7c818d046a
commit 87dd6b3cee
9 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db_structure.php
View File

@@ -225,7 +225,11 @@ foreach ($tables as $keyname => $each_table) {
}
//$display_rows = ' - ';
break;
// Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM
// Both are aliases for MERGE
case 'MRG_MyISAM' :
case 'MRG_MYISAM' :
case 'MERGE' :
case 'BerkeleyDB' :
// Merge or BerkleyDB table: Only row count is accurate.
if ($is_show_stats) {
@@ -254,7 +258,7 @@ foreach ($tables as $keyname => $each_table) {
}
} // end switch
if ('MRG_MYISAM' != $each_table['ENGINE']) {
if (! PMA_Table::isMerge($db, $each_table['TABLE_NAME'])) {
$sum_entries += $each_table['TABLE_ROWS'];
}