Index: distribution/src/main/release/conf/migration/mysql210-220upgrade.sql
===================================================================
--- distribution/src/main/release/conf/migration/mysql210-220upgrade.sql	(revision 1431)
+++ distribution/src/main/release/conf/migration/mysql210-220upgrade.sql	(working copy)
@@ -24,7 +24,7 @@
   INDEX IDX_ODE_JOB_TS(ts),
   INDEX IDX_ODE_JOB_NODEID(nodeid)
 )
-TYPE=InnoDB;
+ENGINE=InnoDB;
 
 COMMIT;
 
@@ -41,7 +41,7 @@
         SERVER_ID varchar(255),
         TIMESTAMP bigint,
         primary key (EID)
-    ) type=InnoDB;;
+    ) ENGINE=InnoDB;;
 
 create table BPAF_EVENT_DATA (
     TID bigint not null auto_increment,
@@ -49,10 +49,10 @@
     VALUE varchar(255),
     EVENT_ID bigint,
     primary key (TID)
-) type=InnoDB;;
+) ENGINE=InnoDB;;
 
 alter table BPAF_EVENT_DATA
     add index FK3E83D1BCDA848C8 (EVENT_ID),
     add constraint FK3E83D1BCDA848C8
     foreign key (EVENT_ID)
-    references BPAF_EVENT (EID);
\ No newline at end of file
+    references BPAF_EVENT (EID);
Index: runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
===================================================================
--- runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql	(revision 1431)
+++ runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql	(working copy)
@@ -25,7 +25,7 @@
   INDEX IDX_ODE_JOB_TS(ts),
   INDEX IDX_ODE_JOB_NODEID(nodeid)
 )
-TYPE=InnoDB;
+ENGINE=InnoDB;
 
 COMMIT;
 
@@ -41,7 +41,7 @@
     REASON varchar(255),
     RETRIES integer,
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_CORRELATION_SET (
     CORRELATION_SET_ID bigint not null auto_increment,
@@ -49,14 +49,14 @@
     NAME varchar(255),
     SCOPE_ID bigint,
     primary key (CORRELATION_SET_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_CORRELATOR (
     CORRELATOR_ID bigint not null auto_increment,
     CORRELATOR_KEY varchar(255),
     PROC_ID bigint,
     primary key (CORRELATOR_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_CORSET_PROP (
     ID bigint not null auto_increment,
@@ -64,7 +64,7 @@
     PROP_KEY varchar(255),
     PROP_VALUE varchar(255),
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_EVENT (
     EVENT_ID bigint not null auto_increment,
@@ -76,7 +76,7 @@
     INSTANCE_ID bigint,
     PROCESS_ID bigint,
     primary key (EVENT_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_FAULT (
     FAULT_ID bigint not null auto_increment,
@@ -86,7 +86,7 @@
     LINE_NUMBER integer,
     NAME varchar(255),
     primary key (FAULT_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_MESSAGE (
     MESSAGE_ID bigint not null auto_increment,
@@ -95,7 +95,7 @@
     TYPE varchar(255),
     MESSAGE_EXCHANGE_ID varchar(255),
     primary key (MESSAGE_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_MESSAGE_EXCHANGE (
     MESSAGE_EXCHANGE_ID varchar(255) not null,
@@ -124,7 +124,7 @@
     REQUEST_MESSAGE_ID bigint,
     RESPONSE_MESSAGE_ID bigint,
     primary key (MESSAGE_EXCHANGE_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_MESSAGE_ROUTE (
     MESSAGE_ROUTE_ID bigint not null auto_increment,
@@ -135,7 +135,7 @@
     ROUTE_POLICY varchar(16),
     CORR_ID bigint,
     primary key (MESSAGE_ROUTE_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_MEX_PROP (
     ID bigint not null auto_increment,
@@ -143,7 +143,7 @@
     PROP_KEY varchar(255),
     PROP_VALUE longtext,
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_PARTNER_LINK (
     PARTNER_LINK_ID bigint not null auto_increment,
@@ -158,7 +158,7 @@
     PARTNER_SESSION_ID varchar(255),
     SCOPE_ID bigint,
     primary key (PARTNER_LINK_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_PROCESS (
     ID bigint not null auto_increment,
@@ -167,7 +167,7 @@
     PROCESS_TYPE varchar(255),
     VERSION bigint,
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_PROCESS_INSTANCE (
     ID bigint not null auto_increment,
@@ -183,7 +183,7 @@
     PROCESS_ID bigint,
     ROOT_SCOPE_ID bigint,
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_SCOPE (
     SCOPE_ID bigint not null auto_increment,
@@ -193,7 +193,7 @@
     PARENT_SCOPE_ID bigint,
     PROCESS_INSTANCE_ID bigint,
     primary key (SCOPE_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_XML_DATA (
     XML_DATA_ID bigint not null auto_increment,
@@ -202,7 +202,7 @@
     NAME varchar(255),
     SCOPE_ID bigint,
     primary key (XML_DATA_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPEL_XML_DATA_PROP (
     ID bigint not null auto_increment,
@@ -210,7 +210,7 @@
     PROP_KEY varchar(255),
     PROP_VALUE varchar(255),
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table STORE_DU (
     NAME varchar(255) not null,
@@ -218,7 +218,7 @@
     DEPLOYER varchar(255),
     DIR varchar(255),
     primary key (NAME)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table STORE_PROCESS (
     PID varchar(255) not null,
@@ -227,27 +227,27 @@
     VERSION bigint,
     DU varchar(255),
     primary key (PID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table STORE_PROCESS_PROP (
     ID bigint not null auto_increment,
     PROP_KEY varchar(255),
     PROP_VAL varchar(255),
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table STORE_PROC_TO_PROP (
     STORE_PROCESS_PID varchar(255) not null,
     STORE_PROPERTY_ID bigint not null,
     primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID),
     unique (STORE_PROPERTY_ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table STORE_VERSIONS (
     ID bigint not null auto_increment,
     VERSION bigint,
     primary key (ID)
-) type=InnoDB;
+) ENGINE=InnoDB;
 
 create table BPAF_EVENT (
         EID bigint not null auto_increment,
@@ -262,7 +262,7 @@
         SERVER_ID varchar(255),
         TIMESTAMP bigint,
         primary key (EID)
-    ) type=InnoDB;;
+    ) ENGINE=InnoDB;;
 
 create table BPAF_EVENT_DATA (
     TID bigint not null auto_increment,
@@ -270,7 +270,7 @@
     VALUE longtext,
     EVENT_ID bigint,
     primary key (TID)
-) type=InnoDB;;
+) ENGINE=InnoDB;;
 
 alter table BPAF_EVENT_DATA
     add index FK3E83D1BCDA848C8 (EVENT_ID),