Index: win_installer/updater/src/ant/update-core-database.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/ant/update-core-database.xml,v
diff -u -r1.1 -r1.2
--- win_installer/updater/src/ant/update-core-database.xml	21 Apr 2008 06:44:23 -0000	1.1
+++ win_installer/updater/src/ant/update-core-database.xml	12 Jun 2008 23:40:40 -0000	1.2
@@ -12,11 +12,24 @@
 			userid="${db.username}" 
 			password="${db.password}"
 			encoding="utf8"
-			onerror="continue">
+			onerror="abort">
 			<transaction src="${temp}/lams/sql/updateConfiguration.sql" />
 			<transaction src="${temp}/lams/sql/alter_21_branching.sql" />
-			<transaction src="${temp}/lams/sql/alter_21_engine.sql" />
 			<transaction src="${temp}/lams/sql/alter_21_groupings_fckeditor.sql" />
+			<transaction src="${temp}/lams/sql/updateLocales.sql" />
 		</sql>
+		
+		<!-- REMOVE BELOW FOR 2.2 -->
+		<echo></echo>
+		<echo>The below script will fail if the database tables are already INNODB, this will not affect the update.</echo>
+		<sql driver="com.mysql.jdbc.Driver" 
+            classpath="${jboss.deploy}/mysql-connector-java-3.1.12-bin.jar" 
+            url="${db.url}" 
+            userid="${db.username}" 
+            password="${db.password}"
+            encoding="utf8"
+            onerror="continue">
+            <transaction src="${temp}/lams/sql/alter_21_engine.sql" />
+        </sql>
 	</target>
 </project>
\ No newline at end of file
Index: win_installer/updater/src/sql/updateLocales.sql
===================================================================
RCS file: /usr/local/cvsroot/win_installer/updater/src/sql/updateLocales.sql,v
diff -u
Binary files differ