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

2010-03-12 17:16:05 -05:00
parent 4a53eb1916
commit 7c818d046a
9 changed files with 49 additions and 21 deletions
--- a/db_operations.php
+++ b/db_operations.php
@@ -110,7 +110,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {

            // do not copy the data from a Merge table
            // note: on the calling FORM, 'data' means 'structure and data'
-            if ($tables_full[$each_table]['Engine'] == 'MRG_MyISAM') {
+            if (PMA_Table::isMerge($db, $each_table)) {
                if ($this_what == 'data') {
                    $this_what = 'structure';
                }