diff --git a/src/main/resources/database/mysql/alter_3_0_0_to_3_0_1.sql b/src/main/resources/database/mysql/alter_3_0_0_to_3_0_1.sql
index 2a40ff05eacf131d2922e56f0b2105b8f9e2b650..736500807909436f6406bda6a36d8613741d5fea 100644
--- a/src/main/resources/database/mysql/alter_3_0_0_to_3_0_1.sql
+++ b/src/main/resources/database/mysql/alter_3_0_0_to_3_0_1.sql
@@ -37,7 +37,7 @@ create table o_bg_buddygroups (
    primary key (group_id)
 ) ;
 --
-alter table o_bg_buddygroups type = InnoDB;
+alter table o_bg_buddygroups ENGINE = InnoDB;
 --
 create index bg_name_idx on o_bg_buddygroups (groupname);
 alter table o_bg_buddygroups add index FK4A14ACF0C06E3EF3 (fk_partipiciantgroup), add constraint FK4A14ACF0C06E3EF3 foreign key (fk_partipiciantgroup) references o_bs_secgroup (id) ;
diff --git a/src/main/resources/database/mysql/alter_3_0_1_to_3_1_0.sql b/src/main/resources/database/mysql/alter_3_0_1_to_3_1_0.sql
index 6983c6884655e7be28dd7a333fee38ec789257c7..a55c5aab78bef488d336351462e8d94a3bf09cbe 100644
--- a/src/main/resources/database/mysql/alter_3_0_1_to_3_1_0.sql
+++ b/src/main/resources/database/mysql/alter_3_0_1_to_3_1_0.sql
@@ -132,11 +132,11 @@ create table o_gp_bgarea (
    primary key (area_id)
 );
 
-alter table o_gp_business type = InnoDB;
-alter table o_gp_bgcontextresource_rel type = InnoDB;
-alter table o_gp_bgcontext type = InnoDB;
-alter table o_gp_bgarea type = InnoDB;
-alter table o_gp_bgtoarea_rel type = InnoDB;
+alter table o_gp_business ENGINE = InnoDB;
+alter table o_gp_bgcontextresource_rel ENGINE = InnoDB;
+alter table o_gp_bgcontext ENGINE = InnoDB;
+alter table o_gp_bgarea ENGINE = InnoDB;
+alter table o_gp_bgtoarea_rel ENGINE = InnoDB;
 
 create index type_idx on o_gp_bgcontext (grouptype);
 create index name_idx on o_gp_bgcontext (name);
@@ -170,7 +170,7 @@ create table o_catentry (
    parent_id bigint,
    primary key (message_id)
 );
-alter table o_catentry type = InnoDB;
+alter table o_catentry ENGINE = InnoDB;
 alter table o_catentry add index FKF4433C2C7B66B0D0 (parent_id), add constraint FKF4433C2C7B66B0D0 foreign key (parent_id) references o_catentry (message_id);
 alter table o_catentry add index FKF4433C2CA1FAC766 (fk_ownergroup), add constraint FKF4433C2CA1FAC766 foreign key (fk_ownergroup) references o_bs_secgroup (id);
 alter table o_catentry add index FKF4433C2C88C31018 (fk_olatresource), add constraint FKF4433C2C88C31018 foreign key (fk_olatresource) references o_olatresource (resource_id);
diff --git a/src/main/resources/database/mysql/alter_3_1_0_to_3_1_1.sql b/src/main/resources/database/mysql/alter_3_1_0_to_3_1_1.sql
index 564fa766da9e8e0528d3ae6c27da9495788d0835..defe2ae8c3ec94b4049d38bde110c0ac086ce17d 100644
--- a/src/main/resources/database/mysql/alter_3_1_0_to_3_1_1.sql
+++ b/src/main/resources/database/mysql/alter_3_1_0_to_3_1_1.sql
@@ -19,7 +19,7 @@ create table o_catentry (
    parent_id bigint,
    primary key (id)
 );
-alter table o_catentry type = InnoDB;
+alter table o_catentry ENGINE = InnoDB;
 alter table o_catentry add index FKF4433C2C7B66B0D0 (parent_id), add constraint FKF4433C2C7B66B0D0 foreign key (parent_id) references o_catentry (id);
 alter table o_catentry add index FKF4433C2CA1FAC766 (fk_ownergroup), add constraint FKF4433C2CA1FAC766 foreign key (fk_ownergroup) references o_bs_secgroup (id);
 alter table o_catentry add index FKF4433C2CDDD69946 (fk_repoentry), add constraint FKF4433C2CDDD69946 foreign key (fk_repoentry) references o_repositoryentry (repositoryentry_id);
diff --git a/src/main/resources/database/mysql/alter_3_1_4_to_3_2_0.sql b/src/main/resources/database/mysql/alter_3_1_4_to_3_2_0.sql
index f3c5cee0a4c642edef628ac07e866e6fbe2f99e8..90e0ef330ef6c6303a231e2960eb6a3750249b44 100644
--- a/src/main/resources/database/mysql/alter_3_1_4_to_3_2_0.sql
+++ b/src/main/resources/database/mysql/alter_3_1_4_to_3_2_0.sql
@@ -19,7 +19,7 @@ create table o_note (
    primary key (note_id)
 );
 
-alter table o_note type = InnoDB;
+alter table o_note ENGINE = InnoDB;
 create index resid_idx on o_note (resourceTypeId);
 create index owner_idx on o_note (owner_id);
 create index restype_idx on o_note (resourceTypeName);
@@ -46,7 +46,7 @@ create table o_noti_pub (
    latestnews datetime not null,
    primary key (publisher_id)
 );
-alter table o_noti_pub type = InnoDB;
+alter table o_noti_pub ENGINE = InnoDB;
 create index notif_type_idx on o_noti_pub (publishertype);
 create index name_idx on o_noti_pub (resname);
 
@@ -65,7 +65,7 @@ create table o_noti_sub (
    primary key (publisher_id),
    unique (fk_publisher, fk_identity)
 );
-alter table o_noti_sub type = InnoDB;
+alter table o_noti_sub ENGINE = InnoDB;
 alter table o_noti_sub add index FK4FB8F04749E53702 (fk_publisher), add constraint FK4FB8F04749E53702 foreign key (fk_publisher) references o_noti_pub (publisher_id);
 alter table o_noti_sub add index FK4FB8F0476B1F22F8 (fk_identity), add constraint FK4FB8F0476B1F22F8 foreign key (fk_identity) references o_bs_identity (id);
 
diff --git a/src/main/resources/database/mysql/alter_5_1_0_to_5_2_0.sql b/src/main/resources/database/mysql/alter_5_1_0_to_5_2_0.sql
index 7b34ac364f2039eeefe7eb7c504b79223296c81c..d42d4453ecaadbe8de45d18bb60204a5daec11c2 100644
--- a/src/main/resources/database/mysql/alter_5_1_0_to_5_2_0.sql
+++ b/src/main/resources/database/mysql/alter_5_1_0_to_5_2_0.sql
@@ -18,7 +18,7 @@ create table o_lifecycle (
    uservalue varchar(255),
    primary key (id)
 );
-alter table o_lifecycle type = InnoDB;
+alter table o_lifecycle ENGINE = InnoDB;
 create index lc_pref_idx on o_lifecycle (persistentref);
 create index lc_type_idx on o_lifecycle (persistenttypename);
 create index lc_action_idx on o_lifecycle (action);
diff --git a/src/main/resources/database/mysql/alter_5_2_x_to_6_0_0.sql b/src/main/resources/database/mysql/alter_5_2_x_to_6_0_0.sql
index 8c7ce3e19a78eae909438421781f80510975c02c..84c54b44beb1bd1363a8fba704fbccbc56d08dd8 100644
--- a/src/main/resources/database/mysql/alter_5_2_x_to_6_0_0.sql
+++ b/src/main/resources/database/mysql/alter_5_2_x_to_6_0_0.sql
@@ -8,7 +8,7 @@ create table o_userproperty (
    propvalue varchar(255),
    primary key (fk_user_id, propname)
 );
-alter table o_userproperty type = InnoDB;
+alter table o_userproperty ENGINE = InnoDB;
 create index propvalue_idx on o_userproperty (propvalue);
 alter table o_userproperty add index FK4B04D83FD1A80C95 (fk_user_id), add constraint FK4B04D83FD1A80C95 foreign key (fk_user_id) references o_user (user_id);
 
@@ -82,7 +82,7 @@ create table o_readmessage (
 	message_id bigint not null, 
 	primary key (id),
 	INDEX identity_forum_idx (identity_id, forum_id));
-alter table o_readmessage type = InnoDB;
+alter table o_readmessage ENGINE = InnoDB;
 
 insert into o_readmessage (id, lastmodified, creationdate, identity_id, forum_id, message_id) select id, lastmodified, creationdate, identity, resourcetypeid, longvalue from o_property where category='rvst';
 
@@ -111,7 +111,7 @@ create table oc_lock (
 );
 create index ocl_asset_idx on oc_lock (asset);
 alter table oc_lock add index FK9E30F4B66115906D (identity_fk), add constraint FK9E30F4B66115906D foreign key (identity_fk) references o_bs_identity (id);
-alter table oc_lock type = InnoDB;
+alter table oc_lock ENGINE = InnoDB;
 -- end cluster lock 
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/src/main/resources/database/mysql/alter_6_0_x_to_6_1_0.sql b/src/main/resources/database/mysql/alter_6_0_x_to_6_1_0.sql
index 8938447a6bbe2a5a8b69a1661010eebbf955c6c8..9caf0660eb0c97d9029a24b76210d9fcf1c411d9 100644
--- a/src/main/resources/database/mysql/alter_6_0_x_to_6_1_0.sql
+++ b/src/main/resources/database/mysql/alter_6_0_x_to_6_1_0.sql
@@ -9,7 +9,7 @@ drop table if exists o_plock ;
 	asset varchar(255) not null unique,	
 	primary key (plock_id)
 );
-alter table o_plock type = InnoDB;
+alter table o_plock ENGINE = InnoDB;
 
 -- tables that keep last modified
 alter table o_repositoryentry add column version bigint;
diff --git a/src/main/resources/database/mysql/alter_6_2_x_to_6_3_0.sql b/src/main/resources/database/mysql/alter_6_2_x_to_6_3_0.sql
index 1cc5c8bbc6f6580bbccdbec73530ef8329bef4d5..33c99bd1b848f9e59e38ea5f5842fff431c4808b 100644
--- a/src/main/resources/database/mysql/alter_6_2_x_to_6_3_0.sql
+++ b/src/main/resources/database/mysql/alter_6_2_x_to_6_3_0.sql
@@ -72,9 +72,9 @@ create table o_checkpoint_results (
    primary key (checkpoint_result_id)
 );
 
-alter table o_checklist type = InnoDB;
-alter table o_checkpoint type = InnoDB;
-alter table o_checkpoint_results type = InnoDB;
+alter table o_checklist ENGINE = InnoDB;
+alter table o_checkpoint ENGINE = InnoDB;
+alter table o_checkpoint_results ENGINE = InnoDB;
 
 alter table o_checkpoint_results add constraint FK9E30F4B661159ZZY foreign key (checkpoint_fk) references o_checkpoint (checkpoint_id) ;
 alter table o_checkpoint_results add constraint FK9E30F4B661159ZZX foreign key (identity_fk) references o_bs_identity (id);
@@ -111,9 +111,9 @@ create table o_projectbroker_customfields (
    primary key (fk_project_id, propname)
 );
 
-alter table o_projectbroker type = InnoDB;
-alter table o_projectbroker_project type = InnoDB;
-alter table o_projectbroker_customfields type = InnoDB;
+alter table o_projectbroker ENGINE = InnoDB;
+alter table o_projectbroker_project ENGINE = InnoDB;
+alter table o_projectbroker_customfields ENGINE = InnoDB;
 
 create index projectbroker_project_broker_idx on o_projectbroker_project (projectbroker_fk);
 create index projectbroker_project_id_idx on o_projectbroker_project (project_id);
@@ -139,7 +139,7 @@ create table o_usercomment (
 	parent_key bigint, 
 	primary key (comment_id)
 );
-alter table o_usercomment type = InnoDB;
+alter table o_usercomment ENGINE = InnoDB;
 create index cmt_id_idx on o_usercomment (resid);
 create index cmt_name_idx on o_usercomment (resname);
 create index cmt_subpath_idx on o_usercomment (ressubpath);
@@ -157,7 +157,7 @@ create table o_userrating (
 	rating integer not null, 
 	primary key (rating_id)
 );
-alter table o_userrating type = InnoDB;
+alter table o_userrating ENGINE = InnoDB;
 create index rtn_id_idx on o_userrating (resid);
 create index rtn_name_idx on o_userrating (resname);
 create index rtn_subpath_idx on o_userrating (ressubpath);
diff --git a/src/main/resources/database/mysql/alter_7_0_x_to_7_1_0.sql b/src/main/resources/database/mysql/alter_7_0_x_to_7_1_0.sql
index fe9f8e79e3ccc3c1a5121676de23f86d656d46b0..2b2c09b168eee69d16f10a918ae0c541d92db2f3 100644
--- a/src/main/resources/database/mysql/alter_7_0_x_to_7_1_0.sql
+++ b/src/main/resources/database/mysql/alter_7_0_x_to_7_1_0.sql
@@ -19,7 +19,7 @@ create table if not exists o_ep_artefact (
   fk_artefact_auth_id bigint not null,
   primary key (artefact_id)
 );
-alter table o_ep_artefact type = InnoDB;
+alter table o_ep_artefact ENGINE = InnoDB;
 alter table o_ep_artefact add constraint FKF26C8375236F28X foreign key (fk_artefact_auth_id) references o_bs_identity (id);
 
 -- eportfolio collect restrictions
@@ -34,7 +34,7 @@ create table if not exists o_ep_collect_restriction (
   fk_struct_el_id bigint,
   primary key (collect_id)
 );
-alter table o_ep_collect_restriction type = InnoDB;
+alter table o_ep_collect_restriction ENGINE = InnoDB;
 
 -- eportfolio structure element
 create table if not exists o_ep_struct_el (
@@ -63,7 +63,7 @@ create table if not exists o_ep_struct_el (
   fk_olatresource bigint not null,
   primary key (structure_id)  
 );
-alter table o_ep_struct_el type = InnoDB;
+alter table o_ep_struct_el ENGINE = InnoDB;
 alter table o_ep_struct_el add constraint FKF26C8375236F26X foreign key (fk_olatresource) references o_olatresource (resource_id);
 alter table o_ep_struct_el add constraint FKF26C8375236F29X foreign key (fk_ownergroup) references o_bs_secgroup (id);
 alter table o_ep_struct_el add constraint FK4ECC1C8D636191A1 foreign key (fk_map_source_id) references o_ep_struct_el (structure_id);
@@ -84,7 +84,7 @@ create table if not exists o_ep_struct_struct_link (
   fk_struct_child_id bigint not null,
   primary key (link_id)
 );
-alter table o_ep_struct_struct_link type = InnoDB;
+alter table o_ep_struct_struct_link ENGINE = InnoDB;
 alter table o_ep_struct_struct_link add constraint FKF26C8375236F22X foreign key (fk_struct_parent_id) references o_ep_struct_el (structure_id);
 alter table o_ep_struct_struct_link add constraint FKF26C8375236F23X foreign key (fk_struct_child_id) references o_ep_struct_el (structure_id);
 
@@ -101,7 +101,7 @@ create table if not exists o_ep_struct_artefact_link (
   primary key (link_id)
 );
 
-alter table o_ep_struct_artefact_link type = InnoDB;
+alter table o_ep_struct_artefact_link ENGINE = InnoDB;
 alter table o_ep_struct_artefact_link add constraint FKF26C8375236F24X foreign key (fk_struct_id) references o_ep_struct_el (structure_id);
 alter table o_ep_struct_artefact_link add constraint FKF26C8375236F25X foreign key (fk_artefact_id) references o_ep_artefact (artefact_id);
 alter table o_ep_struct_artefact_link add constraint FKF26C8375236F26Y foreign key (fk_auth_id) references o_bs_identity (id);
@@ -119,7 +119,7 @@ create table if not exists o_bs_invitation (
    fk_secgroup bigint,
    primary key (id)
 );
-alter table o_bs_invitation type = InnoDB;
+alter table o_bs_invitation ENGINE = InnoDB;
 alter table o_bs_invitation add constraint FKF26C8375236F27X foreign key (fk_secgroup) references o_bs_secgroup (id);
 
 
@@ -138,7 +138,7 @@ create table if not exists o_tag (
   primary key (tag_id)
 );
 
-alter table o_tag type = InnoDB;
+alter table o_tag ENGINE = InnoDB;
 alter table o_tag add constraint FK6491FCA5A4FA5DC foreign key (fk_author_id) references o_bs_identity (id);
 
 -- update policy
@@ -170,7 +170,7 @@ create table if not exists o_info_message (
   fk_modifier_id bigint,
   primary key (info_id)
 );
-alter table o_info_message type = InnoDB;
+alter table o_info_message ENGINE = InnoDB;
 
 create index imsg_resid_idx on o_info_message (resid);
 create index imsg_author_idx on o_info_message (fk_author_id);
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index 9f3f512664f7cc71eb794cf38816422510db847b..0d54d9c684bf77bede8f1f838062c6a2ad38e231 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -420,7 +420,7 @@ create table if not exists o_checklist (
    description longtext,
    primary key (checklist_id)
 );
-alter table o_checklist type = InnoDB;
+alter table o_checklist ENGINE = InnoDB;
 
 create table if not exists o_checkpoint (
    checkpoint_id bigint not null,
@@ -754,56 +754,56 @@ create table if not exists o_ep_struct_artefact_link (
 create index  ocl_asset_idx on oc_lock (asset);
 alter table oc_lock add index FK9E30F4B66115906D (identity_fk), add constraint FK9E30F4B66115906D foreign key (identity_fk) references o_bs_identity (id);
 
-alter table hibernate_unique_key type = InnoDB;
-
-alter table o_forum type = InnoDB;
-alter table o_property type = InnoDB;
-alter table o_bs_secgroup type = InnoDB;
-alter table o_repositorymetadata type = InnoDB;
-alter table o_user type = InnoDB;
-alter table o_userproperty type = InnoDB;
-alter table o_message type = InnoDB;
-alter table o_temporarykey type = InnoDB;
-alter table o_bs_authentication type = InnoDB;
-alter table o_qtiresult type = InnoDB;
-alter table o_qtiresultset type = InnoDB;
-alter table o_bs_identity type = InnoDB;
-alter table o_olatresource type = InnoDB;
-alter table o_bs_policy type = InnoDB;
-alter table o_bs_namedgroup type = InnoDB;
-alter table o_bs_membership type = InnoDB;
-alter table o_repositoryentry type = InnoDB;
-alter table o_bookmark type = InnoDB;
-alter table o_references type = InnoDB;
-alter table o_gp_business type = InnoDB;
-alter table o_gp_bgcontextresource_rel type = InnoDB;
-alter table o_gp_bgcontext type = InnoDB;
-alter table o_gp_bgarea type = InnoDB;
-alter table o_gp_bgtoarea_rel type = InnoDB;
-alter table o_catentry type = InnoDB;
-alter table o_noti_pub type = InnoDB;
-alter table o_noti_sub type = InnoDB;
-alter table o_note type = InnoDB;
-alter table o_lifecycle type = InnoDB;
-alter table o_plock type = InnoDB;
-alter table oc_lock type = InnoDB;
-alter table o_readmessage type = InnoDB;
-alter table o_projectbroker type = InnoDB;
-alter table o_projectbroker_project type = InnoDB;
-alter table o_projectbroker_customfields type = InnoDB;
-alter table o_checkpoint type = InnoDB;
-alter table o_checkpoint_results type = InnoDB;
-alter table o_usercomment type = InnoDB;
-alter table o_userrating type = InnoDB;
-alter table o_mark type = InnoDB;
-alter table o_info_message type = InnoDB;
-alter table o_tag type = InnoDB;
-alter table o_bs_invitation type = InnoDB;
-alter table o_ep_artefact type = InnoDB;
-alter table o_ep_collect_restriction type = InnoDB;
-alter table o_ep_struct_el type = InnoDB;
-alter table o_ep_struct_struct_link type = InnoDB;
-alter table o_ep_struct_artefact_link type = InnoDB;
+alter table hibernate_unique_key ENGINE = InnoDB;
+
+alter table o_forum ENGINE = InnoDB;
+alter table o_property ENGINE = InnoDB;
+alter table o_bs_secgroup ENGINE = InnoDB;
+alter table o_repositorymetadata ENGINE = InnoDB;
+alter table o_user ENGINE = InnoDB;
+alter table o_userproperty ENGINE = InnoDB;
+alter table o_message ENGINE = InnoDB;
+alter table o_temporarykey ENGINE = InnoDB;
+alter table o_bs_authentication ENGINE = InnoDB;
+alter table o_qtiresult ENGINE = InnoDB;
+alter table o_qtiresultset ENGINE = InnoDB;
+alter table o_bs_identity ENGINE = InnoDB;
+alter table o_olatresource ENGINE = InnoDB;
+alter table o_bs_policy ENGINE = InnoDB;
+alter table o_bs_namedgroup ENGINE = InnoDB;
+alter table o_bs_membership ENGINE = InnoDB;
+alter table o_repositoryentry ENGINE = InnoDB;
+alter table o_bookmark ENGINE = InnoDB;
+alter table o_references ENGINE = InnoDB;
+alter table o_gp_business ENGINE = InnoDB;
+alter table o_gp_bgcontextresource_rel ENGINE = InnoDB;
+alter table o_gp_bgcontext ENGINE = InnoDB;
+alter table o_gp_bgarea ENGINE = InnoDB;
+alter table o_gp_bgtoarea_rel ENGINE = InnoDB;
+alter table o_catentry ENGINE = InnoDB;
+alter table o_noti_pub ENGINE = InnoDB;
+alter table o_noti_sub ENGINE = InnoDB;
+alter table o_note ENGINE = InnoDB;
+alter table o_lifecycle ENGINE = InnoDB;
+alter table o_plock ENGINE = InnoDB;
+alter table oc_lock ENGINE = InnoDB;
+alter table o_readmessage ENGINE = InnoDB;
+alter table o_projectbroker ENGINE = InnoDB;
+alter table o_projectbroker_project ENGINE = InnoDB;
+alter table o_projectbroker_customfields ENGINE = InnoDB;
+alter table o_checkpoint ENGINE = InnoDB;
+alter table o_checkpoint_results ENGINE = InnoDB;
+alter table o_usercomment ENGINE = InnoDB;
+alter table o_userrating ENGINE = InnoDB;
+alter table o_mark ENGINE = InnoDB;
+alter table o_info_message ENGINE = InnoDB;
+alter table o_tag ENGINE = InnoDB;
+alter table o_bs_invitation ENGINE = InnoDB;
+alter table o_ep_artefact ENGINE = InnoDB;
+alter table o_ep_collect_restriction ENGINE = InnoDB;
+alter table o_ep_struct_el ENGINE = InnoDB;
+alter table o_ep_struct_struct_link ENGINE = InnoDB;
+alter table o_ep_struct_artefact_link ENGINE = InnoDB;
 
 
 create index  resid_idx on o_property (resourcetypeid);