patch #2969449 Name for MERGE engine varies depending on the MySQL version

This commit is contained in:
Dieter Adriaenssens
2010-03-12 17:16:05 -05:00
committed by Marc Delisle
parent 4a53eb1916
commit 7c818d046a
9 changed files with 49 additions and 21 deletions

View File

@@ -117,7 +117,7 @@ else {
$sum_entries = $sum_size = 0;
$odd_row = true;
foreach ($tables as $sts_data) {
if (strtoupper($sts_data['ENGINE']) == 'MRG_MYISAM'
if (PMA_Table::isMerge($db, $sts_data['TABLE_NAME'])
|| strtoupper($sts_data['ENGINE']) == 'FEDERATED') {
$merged_size = true;
} else {