Fix ENGINE (not TYPE), skip INNODB tables

stealth35 · Mar 28, 2011 · 021c50b · 021c50b
1 parent 92a387b
commit 021c50b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/admin/innodb.php b/admin/innodb.php
@@ -23,10 +23,14 @@
         echo $OUTPUT->notification('Please be patient and wait for this to complete...', 'notifysuccess');
 
         if ($tables = $DB->get_tables()) {
-            $DB->set_debug(true);
             foreach ($tables as $table) {
+                $DB->set_debug(false);
                 $fulltable = $DB->get_prefix().$table;
-                $DB->change_database_structure("ALTER TABLE $fulltable TYPE=INNODB");
+                $rs = $DB->get_records_sql("SHOW TABLE STATUS LIKE '$fulltable'");
+                if(strtoupper($rs[$fulltable]->engine) !== 'INNODB') {
+                    $DB->set_debug(true);
+                    $DB->change_database_structure("ALTER TABLE `$fulltable` ENGINE = INNODB");
+                }                
             }
             $DB->set_debug(false);
         }
@@ -40,6 +44,4 @@
         $formcancel = new single_button(new moodle_url('/admin/index.php'), get_string('no'), 'get');
         echo $OUTPUT->confirm('Are you sure you want convert all your tables to the InnoDB format?', $formcontinue, $formcancel);
         echo $OUTPUT->footer();
-    }
-
-
+    }