From 5f0456ef274a9878a1b26a7c55b4f05aebbc6f75 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 14 Jan 2012 22:52:46 +0100 Subject: [PATCH] MDL-31165 fix InnoDB conversion query to use ENGINE parameter instead of legacy TYPE --- admin/cli/mysql_engine.php | 2 +- admin/tool/innodb/index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/cli/mysql_engine.php b/admin/cli/mysql_engine.php index 53c4b8465dc..c6d7c6ed956 100644 --- a/admin/cli/mysql_engine.php +++ b/admin/cli/mysql_engine.php @@ -76,7 +76,7 @@ if (!empty($options['engine'])) { } echo str_pad($table->name, 40). " - "; - $DB->change_database_structure("ALTER TABLE {$table->name} TYPE = $engine"); + $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine"); echo "DONE\n"; $converted++; } diff --git a/admin/tool/innodb/index.php b/admin/tool/innodb/index.php index faaea89f0e8..bbe4d85bde6 100644 --- a/admin/tool/innodb/index.php +++ b/admin/tool/innodb/index.php @@ -50,7 +50,7 @@ if (data_submitted() and $confirm and confirm_sesskey()) { $DB->set_debug(true); foreach ($tables as $table) { $fulltable = $DB->get_prefix().$table; - $DB->change_database_structure("ALTER TABLE $fulltable TYPE=INNODB"); + $DB->change_database_structure("ALTER TABLE $fulltable ENGINE=INNODB"); } $DB->set_debug(false); }