Commit e14aaf4d authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review

Merge changes I36f9b29e,I907467f2

* changes:
  Improving upgrade success messages (bug 1243525)
  Remove "TYPE=INNODB" (incompatible with MySQL 5)
parents 3b4caf65 307df506
......@@ -154,9 +154,14 @@ $js = <<< EOJS
message = {$installsuccessstring};
}
else {
message = {$successstring};
if (data.message) {
message = data.message;
}
else {
message = {$successstring};
}
}
message += data.newversion ? data.newversion : '?';
message += data.newversion ? data.newversion : '';
}
$(data.key).innerHTML = '<img src="{$successicon}" alt=":)" /> ' + message;
if (data.feedback) {
......
......@@ -16,7 +16,6 @@ function xmldb_core_upgrade($oldversion=0) {
ini_set('max_execution_time', 120); // Let's be safe
raise_memory_limit('256M');
$INNODB = (is_mysql()) ? ' TYPE=innodb' : '';
$status = true;
if ($oldversion < 2009022700) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment