Permalink
Browse files

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

…odle into MOODLE_22_STABLE
  • Loading branch information...
2 parents 6d8e40a + 6e41a68 commit ced892ebb2211ffc215abe8e09114d9871be5eb1 @danpoltawski danpoltawski committed Apr 23, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 admin/tool/innodb/index.php
@@ -46,11 +46,17 @@
echo $OUTPUT->notification('Please be patient and wait for this to complete...', 'notifysuccess');
+ set_time_limit(0);
+
if ($tables = $DB->get_tables()) {
$DB->set_debug(true);
foreach ($tables as $table) {
$fulltable = $DB->get_prefix().$table;
- $DB->change_database_structure("ALTER TABLE $fulltable ENGINE=INNODB");
+ try {
+ $DB->change_database_structure("ALTER TABLE $fulltable ENGINE=INNODB");
+ } catch (moodle_exception $e) {
+ echo $OUTPUT->notification(s($e->getMessage()).'<br />'.s($e->debuginfo));
+ }
}
$DB->set_debug(false);
}

0 comments on commit ced892e

Please sign in to comment.