Merge branch 'w17_MDL-25407_m22_innodb' of git://github.com/skodak/mo…

…odle into MOODLE_22_STABLE
moodle · Apr 24, 2012 · 1d60709 · 1d60709
2 parents 8d66adc + 3b1055e
commit 1d60709
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/admin/cli/mysql_engine.php b/admin/cli/mysql_engine.php
@@ -76,7 +76,13 @@
         }
         echo str_pad($table->name, 40). " - ";
 
-        $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine");
+        try {
+            $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine");
+        } catch (moodle_exception $e) {
+            echo $e->getMessage()."\n";
+            $skipped++;
+            continue;
+        }
         echo "DONE\n";
         $converted++;
     }