Merge branch 'master' of github.com:shish/shimmie2

2012-03-14 19:17:56 +00:00
parent 16af27e6b7 6204046be5
commit cf7d1dded5
3 changed files with 7 additions and 3 deletions
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -44,7 +44,7 @@ class Upgrade extends Extension {
 				$tables = $database->get_col("SHOW TABLES");
 				foreach($tables as $table) {
 					log_info("upgrade", "converting $table to innodb");
-					$database->execute("ALTER TABLE $table TYPE=INNODB");
+					$database->execute("ALTER TABLE $table ENGINE=INNODB");
 				}
 			}