Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Adriaenssens <ruleant@users.sourceforge.net>2010-03-13 01:16:05 +0300
committerMarc Delisle <marc@infomarc.info>2010-03-13 01:16:05 +0300
commit7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d (patch)
tree600df9f5ec4d6aec95c09b4fc0b91e3f18661ce5 /db_printview.php
parent4a53eb19160936770d32244939ee82906e0f88c8 (diff)
patch #2969449 Name for MERGE engine varies depending on the MySQL version
Diffstat (limited to 'db_printview.php')
-rw-r--r--db_printview.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/db_printview.php b/db_printview.php
index bf51015f3d..d656f0e84b 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -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 {