diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
index e417f102f1c87785604e16057e4a2f7936655562..49171c646e97dd3bb6d97c8c4034c6b7d0b4b56a 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
@@ -92,7 +92,7 @@ CREATE TABLE `catalog` (\n
   KEY `Path` (`path`),\n
   KEY `relative_url` (`relative_url`),\n
   KEY `indexation_date` (`indexation_date`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
index e2d43107513cfad22eb357a575090cb26da20376..eccdcc7ad68560e80ebfbedcf8ba2ef31200a45d 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
@@ -65,7 +65,7 @@
   `category_strict_membership` tinyint(1) default \'0\',\n
   PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n
   KEY `Membership` (`category_uid`,`base_category_uid`)\n
-) TYPE = InnoDB;</string> </value>
+) ENGINE=InnoDB;</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
index 9f3345b239baa80036d6188497f62882b51f9640..ae73ca8f234cf93eeb617ae76e157ffc9b5ac6c9 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
@@ -79,7 +79,7 @@
   KEY `resource_uid` (`resource_uid`),\n
   KEY `source_reference` (`source_payment_reference`),\n
   KEY `destination_payment_reference` (`destination_payment_reference`)\n
-) TYPE=InnoDB\n
+) ENGINE=InnoDB\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
index c4cd5cd387fcb4513f5d546e18d2427959cff1f4..434816c07be685ed716612c9324157fe9b68ffed 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
@@ -77,7 +77,7 @@ CREATE TABLE `item` (\n
   KEY `variation_text` (`variation_text`),\n
   KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
   KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 \n
 </string> </value>
         </item>
diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
index 20aa1a36703fd3ec3caf4f24de67add881df65b4..5a22192faf82c89b221d05089360f196ad6356aa 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
@@ -57,7 +57,7 @@
   allowedRolesAndUsers VARCHAR(255) NOT NULL,\n
   KEY `uid` (`uid`),\n
   KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
-)  TYPE=InnoDB; \n
+)  ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
index d72897a3ece203f7e015284c2743c6e62d02dc59..2482bc031264e61a4974859740b77bd3bea59c9c 100644
--- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
+++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
@@ -88,7 +88,7 @@ CREATE TABLE `stock` (\n
   KEY `resource_payment_uid` (`resource_uid`, `payment_uid`),\n
   KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`),\n
   KEY `node_resource_variation_state_date` (`node_uid`, `resource_uid`, `variation_text`, `simulation_state`, `date`)\n
-) TYPE = InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision
index ec303dec77dd0792b28d7fbf359f2c1c1dd43375..989ba2b4b97c321ed9f8f9813d7c7a7b639d3da1 100644
--- a/bt5/erp5_banking_core/bt/revision
+++ b/bt5/erp5_banking_core/bt/revision
@@ -1 +1 @@
-583
\ No newline at end of file
+584
\ No newline at end of file
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml
index 66ecc39e3e134ec772c2a6194e73f01809d5351f..b8cffd6214746e596b80cc5743497c97f088b8e4 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_birth_detail.xml
@@ -65,7 +65,7 @@
   PRIMARY KEY (`uid`),\n
   KEY `birthplace` (`birthplace_city`),\n
   KEY `birth_date` (`birth_date`)\n
-) TYPE=InnoDB\n
+) ENGINE=InnoDB\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
index 5e2935610844f350cc6a654d5665921440782e6e..df1d5eee3eda12828946401834bf36d144de603e 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
+++ b/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
@@ -64,7 +64,7 @@
   `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
   `modification_date` DATETIME,\n
   PRIMARY KEY (`uid`)\n
-) TYPE=InnoDB\n
+) ENGINE=InnoDB\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_egov_mysql_innodb_catalog/bt/revision b/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
index 3e932fe8f188bb6dbcb02afe1306fa6e0b90357b..597975b413303a8c3cb711640e290794dc8077a8 100644
--- a/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
+++ b/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-34
\ No newline at end of file
+35
\ No newline at end of file
diff --git a/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_crawler.xml b/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_crawler.xml
index dac456581ba541b3b69c679770e7e810f470b936..9244797b469c0d37ad5e37b42ed8d0cd28e8f98a 100644
--- a/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_crawler.xml
+++ b/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_crawler.xml
@@ -32,7 +32,7 @@
   `creation_date_index` INT,\n
   PRIMARY KEY  (`uid`),\n
   KEY `creation_date_index` (`creation_date_index`, `frequency_index`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email_thread.xml b/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email_thread.xml
index b32c888788d8df66e96e90e217739bd7e8c8f638..752c4021c069b0ade893771d8f632fa20538d2a8 100644
--- a/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email_thread.xml
+++ b/bt5/erp5_email_reader/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email_thread.xml
@@ -41,7 +41,7 @@
   KEY `bcc_recipient` (`bcc_recipient`),\n
   KEY `validation_state` (`validation_state`),\n
   KEY `start_date` (`start_date`, `validation_state`)\n
-) TYPE = InnoDB;</string> </value>
+) ENGINE=InnoDB;</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_email_reader/bt/revision b/bt5/erp5_email_reader/bt/revision
index a5c750feac4168f62cfd29aa62b4624f0a430cd5..368f89ceef179cc546403ac0d5ef1d0e4b340447 100644
--- a/bt5/erp5_email_reader/bt/revision
+++ b/bt5/erp5_email_reader/bt/revision
@@ -1 +1 @@
-27
\ No newline at end of file
+28
\ No newline at end of file
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml
index 895172ce009e55d4b2714d09c6888c35b1a30bdc..aa986b81aad91be9b113ff3485c42cc3fde6d8e1 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml
@@ -31,7 +31,7 @@
   `url_string` varchar(255),\n
   PRIMARY KEY `uid` (`uid`),\n
   KEY `url_string` (`url_string`)\n
-) TYPE = InnoDB;</string> </value>
+) ENGINE=InnoDB;</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision
index 368f89ceef179cc546403ac0d5ef1d0e4b340447..d99e90eb9675f72290ba32fbf844c1cb45c72718 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-28
\ No newline at end of file
+29
\ No newline at end of file
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
index d9a11b58ed3ed86267283a77491256cf279a36ba..06713c6381987768627218c38097a2bf189992a2 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
@@ -56,7 +56,7 @@
   uid BIGINT UNSIGNED NOT NULL,\n
   outcome_description VARCHAR(255),\n
   PRIMARY KEY `uid` (`uid`)\n
-) TYPE=InnoDB; \n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/bt/revision b/bt5/erp5_project_mysql_innodb_catalog/bt/revision
index b5045cc4046dbc1d7cafa4c603fd3cdf35dc5dde..8fdd954df9831dfd29ceec0d74829b02f3f5d8c3 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/bt/revision
+++ b/bt5/erp5_project_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-21
\ No newline at end of file
+22
\ No newline at end of file
diff --git a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml
index 9c77d5022dc3202cc33d2def1d018ab90f2519dd..ba3365cf41f1215c1b734c9ef256a9c3cc955417 100644
--- a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml
+++ b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml
@@ -60,7 +60,7 @@ CREATE TABLE `worklist_cache` (\n
   KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `viewable_owner`),\n
   KEY `portal_validation_security` (`portal_type`, `validation_state`, `security_uid`),\n
   KEY `portal_validation_owner` (`portal_type`, `validation_state`, `viewable_owner`)\n
-) TYPE=InnoDB
+) ENGINE=InnoDB
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_worklist_sql/bt/revision b/bt5/erp5_worklist_sql/bt/revision
index 7c091989d018956d085a80a955a265ebbb0d0a49..c24b6ae77df02a87472b208f251fad88382a2e55 100644
--- a/bt5/erp5_worklist_sql/bt/revision
+++ b/bt5/erp5_worklist_sql/bt/revision
@@ -1 +1 @@
-37
\ No newline at end of file
+38
\ No newline at end of file
diff --git a/product/CMFActivity/skins/activity/SQLDict_createMessageTable.zsql b/product/CMFActivity/skins/activity/SQLDict_createMessageTable.zsql
index 84b0bc47e15d676577e00873ceb55fb482daf99f..e3b973016b48980f9ac02f7a08df4d8668f694bb 100644
--- a/product/CMFActivity/skins/activity/SQLDict_createMessageTable.zsql
+++ b/product/CMFActivity/skins/activity/SQLDict_createMessageTable.zsql
@@ -34,4 +34,4 @@ CREATE TABLE `message` (
   KEY (`priority`),
   KEY (`tag`),
   KEY (`order_validation_text`)
-) TYPE = InnoDB
+) ENGINE=InnoDB
diff --git a/product/CMFActivity/skins/activity/SQLQueue_createMessageTable.zsql b/product/CMFActivity/skins/activity/SQLQueue_createMessageTable.zsql
index 763d2400feba4cc9d96f19076c5ac21961d30a63..3a9152ab1ed1a89ac8012404b7b20143c220fd38 100644
--- a/product/CMFActivity/skins/activity/SQLQueue_createMessageTable.zsql
+++ b/product/CMFActivity/skins/activity/SQLQueue_createMessageTable.zsql
@@ -32,4 +32,4 @@ CREATE TABLE `message_queue` (
   KEY `serialization_tag_processing_node` (`serialization_tag`, `processing_node`),
   KEY (`priority`),
   KEY (`tag`)
-) TYPE = InnoDB
+) ENGINE=InnoDB
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml
index 7dd0aae9d7468d6a3176bc7d76aad8674384a237..fd37c5161106bad639ee4a4f97f8a953adb634be 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateEmptyTable.xml
@@ -62,7 +62,7 @@
   `id_group` VARBINARY(255),\n
   `last_id` BIGINT UNSIGNED,\n
   PRIMARY KEY  (`id_group`)\n
-) TYPE=InnoDB;</string> </value>
+) ENGINE=InnoDB;</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml
index c7c1cab8b5172aa1190e26d5e299019abd0f9ee6..98f8ed1d1a8f499e699d3969778c17712fa4e2fc 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/IdTool_zCreateTable.xml
@@ -64,7 +64,7 @@ CREATE TABLE `portal_ids` (\n
   `id_group` VARBINARY(255),\n
   `last_id` BIGINT UNSIGNED,\n
   PRIMARY KEY  (`id_group`)\n
-) TYPE=InnoDB\n
+) ENGINE=InnoDB\n
 <dtml-var sql_delimiter>\n
 <dtml-in expr="getPortalObject().portal_ids.getDictLengthIdsItems()">\n
 INSERT INTO `portal_ids` (`id_group`, `last_id`) VALUES (<dtml-sqlvar sequence-key type="string">, <dtml-sqlvar sequence-item type="int">)\n
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml
index 78e65f57e1744526473417c34f81438785685a4c..bd77f9a9b6125763cacc720d7a08da6fb36998b0 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml
@@ -66,7 +66,7 @@ CREATE TABLE `alarm` (\n
   `uid` BIGINT UNSIGNED NOT NULL,\n
   `alarm_date` DATETIME,\n
   PRIMARY KEY  (`uid`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
index d43b8f0b25786d94a2dbfddcb253d0033ccc2f39..1869bc9659a39acb1b31e5e546d07b45faa183ca 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
@@ -113,7 +113,7 @@ CREATE TABLE `catalog` (\n
   KEY `invoice_state` (`invoice_state`),\n
   KEY `payment_state` (`payment_state`),\n
   KEY `event_state` (`event_state`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
index ed2e9e21ca27c247f799c3e662f00b28fa948664..378a91dc49bbb819e4ad60b2fcb33e1a6ca9664e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
@@ -63,7 +63,7 @@ CREATE TABLE `category` (\n
   `category_strict_membership` tinyint(1) default \'0\',\n
   PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n
   KEY `Membership` (`category_uid`,`base_category_uid`)\n
-) TYPE = InnoDB;</string> </value>
+) ENGINE=InnoDB;</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
index 097daf44ef1f6009423cd6edc5fe0ea7bab796c4..749e7ac6769226af5f3cb8dc5e2ff53674a59856 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
@@ -72,7 +72,7 @@
   KEY `destination_section_uid` (`destination_section_uid`),\n
   KEY `resource_uid` (`resource_uid`),\n
   KEY `start_date` (`start_date`)\n
-) TYPE=InnoDB\n
+) ENGINE=InnoDB\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml
index 1f37fcb60e064e997abb103c51a63ae1a45ab18f..0bbbb7f433ee00656888c2c6c1b4bf21ea6df765 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_inventory_stock.xml
@@ -53,7 +53,7 @@
   KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
   KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n
   KEY `date` (`date`)\n
-) TYPE = InnoDB\n
+) ENGINE=InnoDB\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
index dcb229354468d58695ee96c04b008aef5a4d93fc..25f49be5867153e930021ebeded3afeab0cca158 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
@@ -72,7 +72,7 @@ CREATE TABLE `item` (\n
   KEY `variation_text` (`variation_text`),\n
   KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
   KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml
index 96f56cfd850a158b43fa1919f806dc832ee55730..d2a417f992ddc49cffbf3a74aa2b8562a6fe6a5d 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_measure.xml
@@ -60,7 +60,7 @@
   `quantity` REAL NOT NULL,\n
   PRIMARY KEY (`uid`, `variation`),\n
   KEY (`metric_type_uid`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
index 1acedb69376c12ee7378375d26c18e514a5bf622..6abcc416130103a6085cab7ab006c8d1d2d96d99 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
@@ -76,7 +76,7 @@ CREATE TABLE `movement` (\n
   KEY `resource_uid` (`resource_uid`),\n
   KEY `is_accountable` (`is_accountable`),\n
   KEY `variation_text` (`variation_text`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml
index a8359dee6d84ca8d3f1de18f9e6151da138d9c18..1c067ea25455cb68a5940f7be1d1658fe5522952 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate.xml
@@ -61,7 +61,7 @@
   `start_date_range_min` datetime ,\n
   `start_date_range_max` datetime ,\n
   PRIMARY KEY `uid` (`uid`)\n
-) TYPE=InnoDB; \n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml
index 371bfd93fd4945d593dce48dae3303c50d845f47..5fee7a3aba80a9678298311086a63f2216cedc0f 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_predicate_category.xml
@@ -65,7 +65,7 @@ CREATE TABLE `predicate_category` (\n
   KEY `category_strict_membership` (`category_strict_membership`),\n
   KEY `Membership` (`category_uid`,`base_category_uid`),\n
   KEY `FuzzyMembership` (`category_uid`)\n
-) TYPE = InnoDB; \n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml
index a98f476d567bd473585835e3ad17a57914aa1023..3a4298af9f03bfbe06a35dc07f43ba862db09cd5 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_quantity_unit_conversion.xml
@@ -33,7 +33,7 @@
   `quantity` REAL NOT NULL,\n
   PRIMARY KEY (`resource_uid`, `quantity_unit_uid`),\n
   KEY (`uid`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml
index 49679204abf3f597f138db1ec9be20b24989dc90..84e4f61b404639f76ef39f26707e16d2ebf17836 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_record.xml
@@ -65,7 +65,7 @@ CREATE TABLE `record` (\n
   PRIMARY KEY  (`uid`),\n
   KEY `played` (`played`),\n
   KEY `date` (`date`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
index f347028ba052535980446c55d899610b686e0341..bbf2defd85008c05ecd5d476e8efa799301011b1 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
@@ -57,7 +57,7 @@
   allowedRolesAndUsers VARCHAR(255),\n
   KEY `uid` (`uid`),\n
   KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
-)  TYPE=InnoDB; \n
+)  ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
index 2387946cbab24e26f4e46f0d370f25e76322dcc6..b1a0152b8e91d117283cb29b6ca99ee42f9672a1 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
@@ -90,7 +90,7 @@ CREATE TABLE `stock` (\n
   KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
   KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n
   KEY `date` (`date`)\n
-) TYPE = InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml
index dd1fd2425418ed9756159b49e04b30dca3c21ca9..e5476de6e467925b64cb993843c96a949169f20c 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_subject.xml
@@ -57,7 +57,7 @@
   subject VARCHAR(255),\n
   KEY `subject_set_uid` (`subject_set_uid`),\n
   KEY `subject` (`subject`)\n
-) TYPE=InnoDB; \n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml
index 5ebfcf3a1e237c6caabc87ada0d5edf568feb090..a2195eb2cc229f41542542d568de13dd696532a8 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_translation.xml
@@ -67,7 +67,7 @@
   KEY `message` (`translated_message`),\n
   KEY `original_message` (`original_message`),\n
   KEY `portal_type` (`portal_type`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml
index 1fd8ad0d39aa9a20dbab4d9e338dcf230d6f0861..b2f0462df54f15a716481adbe9430abe8bc5b243 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_versioning.xml
@@ -43,7 +43,7 @@
   KEY `effective_date` (`effective_date`),\n
   KEY `expiration_date` (`effective_date`),\n
   KEY `frequency_index` (`creation_date_index`, `frequency_index`)\n
-) TYPE=InnoDB;\n
+) ENGINE=InnoDB;\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
index 396054452291e2e07fcd9f33cd76ea228a88aa3a..c5a644422fb8f683632c43a9973c6f9bf3d5a12e 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-220
\ No newline at end of file
+221
\ No newline at end of file
diff --git a/product/ERP5Catalog/sql/common_mysql/z_create_record.zsql b/product/ERP5Catalog/sql/common_mysql/z_create_record.zsql
index c7465995e90a62f34e02c0075dd947f5ae073ae8..e31309f42f11d48ff600a97ec9c962471efad450 100644
--- a/product/ERP5Catalog/sql/common_mysql/z_create_record.zsql
+++ b/product/ERP5Catalog/sql/common_mysql/z_create_record.zsql
@@ -21,4 +21,4 @@ CREATE TABLE `record` (
   PRIMARY KEY  (`uid`),
   KEY `played` (`played`),
   KEY `date` (`date`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/cps3_mysql/z_create_local_users_with_roles.zsql b/product/ERP5Catalog/sql/cps3_mysql/z_create_local_users_with_roles.zsql
index 5e36c74d1f4b77e30fd31d0fe270e29314cfc763..764b33de18a852ade91fcc58d388ecfbac3f3aed 100644
--- a/product/ERP5Catalog/sql/cps3_mysql/z_create_local_users_with_roles.zsql
+++ b/product/ERP5Catalog/sql/cps3_mysql/z_create_local_users_with_roles.zsql
@@ -13,4 +13,4 @@ CREATE TABLE local_users_with_roles (
   localUsersWithRoles VARCHAR(40),
   KEY `uid` (`uid`),
   KEY `localUsersWithRoles` (`localUsersWithRoles`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql
index e0e36881aec4a14a6a40b3230f53a2a7b9ebb47d..4336f1d5e100a2d07b3a9b2d33bf978b78eca26b 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_catalog.zsql
@@ -58,4 +58,4 @@ CREATE TABLE `catalog` (
   KEY `invoice_state` (`invoice_state`),
   KEY `payment_state` (`payment_state`),
   KEY `event_state` (`event_state`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_category.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_category.zsql
index a1e0cf9cd8f5df9de2c0bb17e30289c38ccc3c18..e1ac9898789ddc3c8523d6d43867de767d5e8f4d 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_category.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_category.zsql
@@ -21,4 +21,4 @@ CREATE TABLE `category` (
   KEY `category_strict_membership` (`category_strict_membership`),
   KEY `Membership` (`category_uid`,`base_category_uid`),
   KEY `FuzzyMembership` (`category_uid`)
-) TYPE = InnoDB; 
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_compatibility.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_compatibility.zsql
index 88bfc864f7e82e35690c4eb5ee829ae3b9e8b573..64198993d3d905e470f02e7ee7619985c9e1bf91 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_compatibility.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_compatibility.zsql
@@ -35,4 +35,4 @@ CREATE TABLE `compatibility` (
   PRIMARY KEY  (`uid`),
   KEY `Type` (`Type`),
   KEY `review_state` (`review_state`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_delivery.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_delivery.zsql
index 0870905687e8d9f7dd64028da125c4b8ce98fb04..0df9de1d5ea6eb031279263dee5b672b4db51c5b 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_delivery.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_delivery.zsql
@@ -27,4 +27,4 @@ CREATE TABLE `delivery` (
   KEY `source_section_uid` (`source_section_uid`),
   KEY `destination_section_uid` (`destination_section_uid`),
   KEY `resource_uid` (`resource_uid`)
-) TYPE=InnoDB
+) ENGINE=InnoDB
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_item.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_item.zsql
index 60d07825d5fbce6a5e2045c48af370414e21d39c..7907a4968df02c30ef2d436bb0ed04671e27ae0e 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_item.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_item.zsql
@@ -25,5 +25,5 @@ CREATE TABLE `item` (
   KEY `section_uid` (`section_uid`),
   KEY `resource_uid` (`resource_uid`),
   KEY `variation_text` (`variation_text`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
 
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql
index 4973cd7ab585e69855462ea703bb09d13f007a69..5d235fd033a426260f90acfc914e178fda72a28e 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_movement.zsql
@@ -36,4 +36,4 @@ CREATE TABLE `movement` (
   KEY `is_orderable` (`is_orderable`),
   KEY `is_deliverable` (`is_deliverable`),
   KEY `variation_text` (`variation_text`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate.zsql
index fdd040717f33de1a6513504b6fbc280463518251..516dd40a590c8aa97ab480600c444538a4bdce0c 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate.zsql
@@ -17,4 +17,4 @@ CREATE TABLE predicate (
   `start_date_range_min` datetime ,
   `start_date_range_max` datetime ,
   PRIMARY KEY `uid` (`uid`)
-) TYPE=InnoDB; 
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate_category.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate_category.zsql
index 1223699f29201153f1d8b97c0994a97ae9dee439..fa9fa3034c8c3305c8e1936a440be1f5cb9dfc0d 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate_category.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_predicate_category.zsql
@@ -21,4 +21,4 @@ CREATE TABLE `predicate_category` (
   KEY `category_strict_membership` (`category_strict_membership`),
   KEY `Membership` (`category_uid`,`base_category_uid`),
   KEY `FuzzyMembership` (`category_uid`)
-) TYPE = InnoDB; 
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_roles_and_users.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_roles_and_users.zsql
index ca5de32e0d47b66287ecdf2e59520553f4064528..9e095b9761418d743c99dc66a7311f380e17ab84 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_roles_and_users.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_roles_and_users.zsql
@@ -13,4 +13,4 @@ CREATE TABLE roles_and_users (
   allowedRolesAndUsers VARCHAR(255),
   KEY `uid` (`uid`),
   KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)
-)  TYPE=InnoDB; 
+)  ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_stock.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_stock.zsql
index 15bca8a3b8a06b731b9805efb862c08aacde60b7..855b108e3d7f060ebcc3c1f069bbd2abed01d563 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_stock.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_stock.zsql
@@ -42,4 +42,4 @@ CREATE TABLE `stock` (
   KEY `simulation_state` (`simulation_state`),
   KEY `resource_node_uid` (`resource_uid`, `node_uid`),
   KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`)
-) TYPE = InnoDB;
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_subject.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_subject.zsql
index 562e0c087e0727634f2aca5264f35c4a4b9d2a10..0dc167d4de3f98867a61fcc2c3a006e4279e3e30 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_subject.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_subject.zsql
@@ -13,4 +13,4 @@ CREATE TABLE subject (
   subject VARCHAR(255),
   PRIMARY KEY `uid` (`uid`),
   KEY `allowedRolesAndUsers` (`Subject`)
-) TYPE=InnoDB; 
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_create_translation.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_create_translation.zsql
index 0613cc5bb70637af88dda5e8ca1611fb8d35a71b..36c9aa0a8977387088eae03d372736260f02e3ba 100644
--- a/product/ERP5Catalog/sql/erp5_mysql/z_create_translation.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_create_translation.zsql
@@ -15,4 +15,4 @@ CREATE TABLE translation (
   translated_message VARCHAR(255),
   KEY `message` (`translated_message`),
   KEY `original_message` (`original_message`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
diff --git a/product/ERP5Catalog/tests/testERP5Catalog.py b/product/ERP5Catalog/tests/testERP5Catalog.py
index 9b6019557ffda664617ff32d05c9abb49195b7ba..f0a69e364fda75c7c484dd79544b43be49cf79f3 100644
--- a/product/ERP5Catalog/tests/testERP5Catalog.py
+++ b/product/ERP5Catalog/tests/testERP5Catalog.py
@@ -1702,7 +1702,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
     `uid` BIGINT UNSIGNED NOT NULL,
     `dummy_title` varchar(32) NOT NULL default '',
     PRIMARY KEY  (`uid`)
-    ) TYPE=InnoDB;
+    ) ENGINE=InnoDB;
     """
     drop_summy_table_sql = """
     DROP TABLE IF EXISTS `dummy`
@@ -2706,7 +2706,7 @@ CREATE TABLE `%s` (
   `owner_reference` varchar(32) NOT NULL default '',
   PRIMARY KEY  (`uid`),
   KEY `version` (`owner_reference`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
     """ % local_roles_table
     sql_catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
           id = 'z_create_%s' % local_roles_table,
@@ -2899,7 +2899,7 @@ CREATE TABLE `%s` (
   PRIMARY KEY  (`uid`),
   KEY `assignee_reference` (`assignee_reference`),
   KEY `viewable_assignee_reference` (`viewable_assignee_reference`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
     """ % local_roles_table
     sql_catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
           id = 'z_create_%s' % local_roles_table,
@@ -3063,7 +3063,7 @@ CREATE TABLE `%s` (
   PRIMARY KEY  (`uid`),
   KEY `assignee_reference` (`assignee_reference`),
   KEY `viewable_assignee_reference` (`viewable_assignee_reference`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
     """ % local_roles_table
     sql_catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
           id = 'z_create_%s' % local_roles_table,
@@ -3319,7 +3319,7 @@ CREATE TABLE `%s` (
   `viewable_assignee_reference` varchar(32) NOT NULL default '',
   PRIMARY KEY  (`uid`),
   KEY `viewable_assignee_reference` (`viewable_assignee_reference`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
     """ % local_roles_table
     sql_catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
           id = 'z_create_%s' % local_roles_table,
@@ -3549,7 +3549,7 @@ CREATE TABLE `%s` (
   `viewable_assignee_reference` varchar(32) NOT NULL default '',
   PRIMARY KEY  (`uid`),
   KEY `viewable_assignee_reference` (`viewable_assignee_reference`)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
     """ % local_roles_table
     sql_catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
           id = 'z_create_%s' % local_roles_table,