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

@@ -279,10 +279,9 @@ foreach ($the_tables as $key => $table) {
}
if ($nonisam == false) {
// Gets some sizes
$mergetable = false;
if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') {
$mergetable = true;
}
$mergetable = PMA_Table::isMerge($db, $table);
list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']);
if ($mergetable == false) {
list($index_size, $index_unit) = PMA_formatByteDown($showtable['Index_length']);