Improvements of WEB monitoring and MySQL upgrade patches.

git-svn-id: svn://svn.zabbix.com/trunk@3784 97f52cf1-0a1b-0410-bd0e-c28be96e8082

59 files changed, 67 insertions, 66 deletions

diff --git a/upgrades/dbpatches/1.3/mysql/patch/acknowledges.sql b/upgrades/dbpatches/1.3/mysql/patch/acknowledges.sql
index ad291442..4d9a9b20 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/acknowledges.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/acknowledges.sql
@@ -5,7 +5,7 @@ CREATE TABLE acknowledges_tmp (
 	clock		integer		DEFAULT '0'	NOT NULL,
 	message		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (acknowledgeid)
-);
+) ENGINE=InnoDB ;
 CREATE INDEX acknowledges_1 on acknowledges_tmp (userid);
 CREATE INDEX acknowledges_2 on acknowledges_tmp (eventid);
 CREATE INDEX acknowledges_3 on acknowledges_tmp (clock);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/actions.sql b/upgrades/dbpatches/1.3/mysql/patch/actions.sql
index 056686ae..7581dd2c 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/actions.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/actions.sql
@@ -11,7 +11,7 @@ CREATE TABLE actions_tmp (
 	status		integer		DEFAULT '0'	NOT NULL,
 	scripts		blob		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (actionid)
-);
+) ENGINE=InnoDB ;
 
 insert into actions_tmp select * from actions;
 drop table actions;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/alerts.sql b/upgrades/dbpatches/1.3/mysql/patch/alerts.sql
index 4dfbdc98..19230ecb 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/alerts.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/alerts.sql
@@ -16,7 +16,7 @@ CREATE TABLE alerts_tmp (
 	nextcheck		integer		DEFAULT '0'	NOT NULL,
 	delay		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (alertid)
-);
+) ENGINE=InnoDB ;
 CREATE INDEX alerts_1 on alerts_tmp (actionid);
 CREATE INDEX alerts_2 on alerts_tmp (clock);
 CREATE INDEX alerts_3 on alerts_tmp (triggerid);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/applications.sql b/upgrades/dbpatches/1.3/mysql/patch/applications.sql
index fd2b07f6..9b18bfb7 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/applications.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/applications.sql
@@ -4,7 +4,8 @@ CREATE TABLE applications_tmp (
 	name		varchar(255)		DEFAULT ''	NOT NULL,
 	templateid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (applicationid)
-);
+) ENGINE=InnoDB ;
+
 CREATE INDEX applications_1 on applications_tmp (templateid);
 CREATE UNIQUE INDEX applications_2 on applications_tmp (hostid,name);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/auditlog.sql b/upgrades/dbpatches/1.3/mysql/patch/auditlog.sql
index e34d96f8..6db8afbf 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/auditlog.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/auditlog.sql
@@ -6,7 +6,7 @@ CREATE TABLE auditlog_tmp (
 	resourcetype		integer		DEFAULT '0'	NOT NULL,
 	details		varchar(128)		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (auditid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX auditlog_1 on auditlog_tmp (userid,clock);
 CREATE INDEX auditlog_2 on auditlog_tmp (clock);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/autoreg.sql b/upgrades/dbpatches/1.3/mysql/patch/autoreg.sql
index 8914f770..9a9861d2 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/autoreg.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/autoreg.sql
@@ -4,7 +4,7 @@ CREATE TABLE autoreg_tmp (
 	pattern		varchar(255)		DEFAULT ''	NOT NULL,
 	hostid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 
 insert into autoreg_tmp select * from autoreg;
 drop table autoreg;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/conditions.sql b/upgrades/dbpatches/1.3/mysql/patch/conditions.sql
index 1c328990..ddf10df4 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/conditions.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/conditions.sql
@@ -5,7 +5,7 @@ CREATE TABLE conditions_tmp (
 	operator		integer		DEFAULT '0'	NOT NULL,
 	value		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (conditionid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX conditions_1 on conditions_tmp (actionid);
 
 insert into conditions_tmp select * from conditions;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/config.sql b/upgrades/dbpatches/1.3/mysql/patch/config.sql
index 062f9eb2..438fd3b1 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/config.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/config.sql
@@ -5,7 +5,7 @@ CREATE TABLE config_tmp (
 	refresh_unsupported		integer		DEFAULT '0'	NOT NULL,
 	work_period		varchar(100)		DEFAULT '1-5,00:00-24:00'	NOT NULL,
 	PRIMARY KEY (configid)
-);
+) ENGINE=InnoDB;
 
 insert into config_tmp select 1,alert_history,alarm_history,refresh_unsupported,work_period from config;
 drop table config;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/events.sql b/upgrades/dbpatches/1.3/mysql/patch/events.sql
index e4a43f5b..518f1c54 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/events.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/events.sql
@@ -5,7 +5,7 @@ CREATE TABLE events (
 	value		integer		DEFAULT '0'	NOT NULL,
 	acknowledged		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (eventid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX events_1 on events (triggerid,clock);
 CREATE INDEX events_2 on events (clock);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/functions.sql b/upgrades/dbpatches/1.3/mysql/patch/functions.sql
index 0817aec5..721b8ce0 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/functions.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/functions.sql
@@ -6,7 +6,7 @@ CREATE TABLE functions_tmp (
 	function		varchar(12)		DEFAULT ''	NOT NULL,
 	parameter		varchar(255)		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (functionid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX functions_1 on functions_tmp (triggerid);
 CREATE INDEX functions_2 on functions_tmp (itemid,function,parameter);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/graphs.sql b/upgrades/dbpatches/1.3/mysql/patch/graphs.sql
index 66a2b113..03bb2fb0 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/graphs.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/graphs.sql
@@ -11,7 +11,7 @@ CREATE TABLE graphs_tmp (
 	show_triggers		integer		DEFAULT '1'	NOT NULL,
 	graphtype		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (graphid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX graphs_graphs_1 on graphs_tmp (name);
 
 insert into graphs_tmp select *,0 from graphs;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/graphs_items.sql b/upgrades/dbpatches/1.3/mysql/patch/graphs_items.sql
index 2145623d..e5184b6b 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/graphs_items.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/graphs_items.sql
@@ -10,7 +10,7 @@ CREATE TABLE graphs_items_tmp (
 	type		integer		DEFAULT '0'	NOT NULL,
 	periods_cnt		integer		DEFAULT '5'	NOT NULL,
 	PRIMARY KEY (gitemid)
-);
+) ENGINE=InnoDB;
 
 insert into graphs_items_tmp select * from graphs_items;
 drop table graphs_items;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/groups.sql b/upgrades/dbpatches/1.3/mysql/patch/groups.sql
index 50d34437..87ad39b2 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/groups.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/groups.sql
@@ -2,7 +2,7 @@ CREATE TABLE groups_tmp (
 	groupid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	name		varchar(64)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (groupid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX groups_1 on groups_tmp (name);
 
 insert into groups_tmp select * from groups;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/help_items.sql b/upgrades/dbpatches/1.3/mysql/patch/help_items.sql
index 718279c5..ca347713 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/help_items.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/help_items.sql
@@ -3,7 +3,7 @@ CREATE TABLE help_items_tmp (
 	key_		varchar(255)		DEFAULT ''	NOT NULL,
 	description		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (itemtype,key_)
-);
+) ENGINE=InnoDB;
 
 insert into help_items_tmp select * from help_items;
 drop table help_items;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history.sql b/upgrades/dbpatches/1.3/mysql/patch/history.sql
index ad7763ab..c08bae1c 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history.sql
@@ -2,7 +2,7 @@ CREATE TABLE history_tmp (
 	itemid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		double(16,4)		DEFAULT '0.0000'	NOT NULL
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_1 on history_tmp (itemid,clock);
 
 insert into history_tmp select * from history;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history_log.sql b/upgrades/dbpatches/1.3/mysql/patch/history_log.sql
index cd2e2889..683d0aa9 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history_log.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history_log.sql
@@ -7,7 +7,7 @@ CREATE TABLE history_log_tmp (
 	severity		integer		DEFAULT '0'	NOT NULL,
 	value		text		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_log_1 on history_log_tmp (itemid,clock);
 
 insert into history_log_tmp select * from history_log;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history_str.sql b/upgrades/dbpatches/1.3/mysql/patch/history_str.sql
index 9a3732be..add46772 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history_str.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history_str.sql
@@ -2,7 +2,7 @@ CREATE TABLE history_str_tmp (
 	itemid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		varchar(255)		DEFAULT ''	NOT NULL
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_str_1 on history_str_tmp (itemid,clock);
 
 insert into history_str_tmp select * from history_str;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history_str_sync.sql b/upgrades/dbpatches/1.3/mysql/patch/history_str_sync.sql
index a1170393..22e1b4f2 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history_str_sync.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history_str_sync.sql
@@ -5,5 +5,5 @@ CREATE TABLE history_str_sync (
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_str_sync_1 on history_str_sync (nodeid,id);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history_sync.sql b/upgrades/dbpatches/1.3/mysql/patch/history_sync.sql
index 9c9feedf..17fd64f4 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history_sync.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history_sync.sql
@@ -5,5 +5,5 @@ CREATE TABLE history_sync (
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		double(16,4)		DEFAULT '0.0000'	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_sync_1 on history_sync (nodeid,id);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history_text.sql b/upgrades/dbpatches/1.3/mysql/patch/history_text.sql
index 68fa4dd3..f67efcae 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history_text.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history_text.sql
@@ -4,7 +4,7 @@ CREATE TABLE history_text_tmp (
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		text		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_text_1 on history_text_tmp (itemid,clock);
 
 insert into history_text_tmp select * from history_text;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history_uint.sql b/upgrades/dbpatches/1.3/mysql/patch/history_uint.sql
index aa65ae28..1b451a73 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history_uint.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history_uint.sql
@@ -2,7 +2,7 @@ CREATE TABLE history_uint_tmp (
 	itemid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		bigint unsigned		DEFAULT '0'	NOT NULL
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_uint_1 on history_uint_tmp (itemid,clock);
 
 insert into history_uint_tmp select * from history_uint;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/history_uint_sync.sql b/upgrades/dbpatches/1.3/mysql/patch/history_uint_sync.sql
index 19f2ef4c..3f875b42 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/history_uint_sync.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/history_uint_sync.sql
@@ -5,5 +5,5 @@ CREATE TABLE history_uint_sync (
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 CREATE INDEX history_uint_sync_1 on history_uint_sync (nodeid,id);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/hosts.sql b/upgrades/dbpatches/1.3/mysql/patch/hosts.sql
index 9aa28279..2e47cd7d 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/hosts.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/hosts.sql
@@ -10,7 +10,7 @@ CREATE TABLE hosts_tmp (
 	available		integer		DEFAULT '0'	NOT NULL,
 	errors_from		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (hostid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX hosts_1 on hosts_tmp (host);
 CREATE INDEX hosts_2 on hosts_tmp (status);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/hosts_groups.sql b/upgrades/dbpatches/1.3/mysql/patch/hosts_groups.sql
index 05b179d1..457d6ffb 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/hosts_groups.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/hosts_groups.sql
@@ -3,7 +3,7 @@ CREATE TABLE hosts_groups_tmp (
 	hostid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	groupid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (hostgroupid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX hosts_groups_groups_1 on hosts_groups_tmp (hostid,groupid);
 
 insert into hosts_groups_tmp select NULL,hostid,groupid from hosts_groups;
@@ -16,7 +16,7 @@ CREATE TABLE hosts_groups_tmp (
 	hostid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	groupid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (hostgroupid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX hosts_groups_groups_1 on hosts_groups_tmp (hostid,groupid);
 
 insert into hosts_groups_tmp select * from hosts_groups;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/hosts_profiles.sql b/upgrades/dbpatches/1.3/mysql/patch/hosts_profiles.sql
index 379cdfd2..8213add8 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/hosts_profiles.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/hosts_profiles.sql
@@ -12,7 +12,7 @@ CREATE TABLE hosts_profiles_tmp (
 	location		blob		DEFAULT ''	NOT NULL,
 	notes		blob		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (hostid)
-);
+) ENGINE=InnoDB;
 
 insert into hosts_profiles_tmp select * from hosts_profiles;
 drop table hosts_profiles;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/hosts_templates.sql b/upgrades/dbpatches/1.3/mysql/patch/hosts_templates.sql
index 7c40627f..98dc2df0 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/hosts_templates.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/hosts_templates.sql
@@ -3,7 +3,7 @@ CREATE TABLE hosts_templates_tmp (
 	hostid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	templateid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (hosttemplateid)
-);
+) ENGINE=InnoDB;
 CREATE UNIQUE INDEX hosts_templates_1 on hosts_templates_tmp (hostid,templateid);
 
 insert into hosts_templates_tmp select NULL,hostid,templateid from  hosts_templates;
@@ -15,7 +15,7 @@ CREATE TABLE hosts_templates_tmp (
 	hostid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	templateid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (hosttemplateid)
-);
+) ENGINE=InnoDB;
 CREATE UNIQUE INDEX hosts_templates_1 on hosts_templates_tmp (hostid,templateid);
 
 insert into hosts_templates_tmp select * from  hosts_templates;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/housekeeper.sql b/upgrades/dbpatches/1.3/mysql/patch/housekeeper.sql
index c67f0b73..15c88634 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/housekeeper.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/housekeeper.sql
@@ -4,7 +4,7 @@ CREATE TABLE housekeeper_tmp (
 	field		varchar(64)		DEFAULT ''	NOT NULL,
 	value		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (housekeeperid)
-);
+) ENGINE=InnoDB;
 
 insert into housekeeper_tmp select * from housekeeper;
 drop table housekeeper;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/httpstep.sql b/upgrades/dbpatches/1.3/mysql/patch/httpstep.sql
index 958c0211..b0cfd6ba 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/httpstep.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/httpstep.sql
@@ -8,5 +8,5 @@ CREATE TABLE httpstep (
 	posts		blob		DEFAULT ''	NOT NULL,
 	required		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (httpstepid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX httpstep_httpstep_1 on httpstep (httptestid);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/httpstepitem.sql b/upgrades/dbpatches/1.3/mysql/patch/httpstepitem.sql
index 3a0fa50d..56b43ff4 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/httpstepitem.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/httpstepitem.sql
@@ -4,5 +4,5 @@ CREATE TABLE httpstepitem (
 	itemid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	type		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (httpstepitemid)
-);
+) ENGINE=InnoDB;
 CREATE UNIQUE INDEX httpstepitem_httpstepitem_1 on httpstepitem (httpstepid,itemid);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/httptest.sql b/upgrades/dbpatches/1.3/mysql/patch/httptest.sql
index 4197f377..e898fa63 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/httptest.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/httptest.sql
@@ -13,5 +13,5 @@ CREATE TABLE httptest (
 	agent		varchar(255)		DEFAULT ''	NOT NULL,
 	time		double(16,4)		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (httptestid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX httptest_httptest_1 on httptest (httptestid);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/httptestitem.sql b/upgrades/dbpatches/1.3/mysql/patch/httptestitem.sql
index a8fa36d9..7efcc231 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/httptestitem.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/httptestitem.sql
@@ -4,5 +4,5 @@ CREATE TABLE httptestitem (
 	itemid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	type		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (httptestitemid)
-);
+) ENGINE=InnoDB;
 CREATE UNIQUE INDEX httptestitem_httptestitem_1 on httptestitem (httptestid,itemid);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/images.sql b/upgrades/dbpatches/1.3/mysql/patch/images.sql
index 89819a8a..0beab83d 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/images.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/images.sql
@@ -4,7 +4,7 @@ CREATE TABLE images_tmp (
 	name		varchar(64)		DEFAULT '0'	NOT NULL,
 	image		longblob		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (imageid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX images_1 on images_tmp (imagetype,name);
 
 insert into images_tmp select * from images`;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/items.sql b/upgrades/dbpatches/1.3/mysql/patch/items.sql
index 94bd76b0..2093e4a2 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/items.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/items.sql
@@ -33,7 +33,7 @@ CREATE TABLE items_tmp (
 	valuemapid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	delay_flex		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (itemid)
-);
+) ENGINE=InnoDB;
 CREATE UNIQUE INDEX items_1 on items_tmp (hostid,key_);
 CREATE INDEX items_2 on items_tmp (nextcheck);
 CREATE INDEX items_3 on items_tmp (status);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/items_applications.sql b/upgrades/dbpatches/1.3/mysql/patch/items_applications.sql
index b426ea67..92178eb7 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/items_applications.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/items_applications.sql
@@ -3,7 +3,7 @@ CREATE TABLE items_applications_tmp (
 	applicationid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	itemid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (itemappid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX items_applications_1 on items_applications_tmp (applicationid,itemid);
 
 insert into items_applications_tmp select NULL,applicationid,applicationid from items_applications;
@@ -15,7 +15,7 @@ CREATE TABLE items_applications_tmp (
 	applicationid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	itemid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (itemappid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX items_applications_1 on items_applications_tmp (applicationid,itemid);
 
 insert into items_applications_tmp select * from items_applications;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/mappings.sql b/upgrades/dbpatches/1.3/mysql/patch/mappings.sql
index 72029fbc..afeb59ac 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/mappings.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/mappings.sql
@@ -4,7 +4,7 @@ CREATE TABLE mappings_tmp (
 	value		varchar(64)		DEFAULT ''	NOT NULL,
 	newvalue		varchar(64)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (mappingid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX mappings_1 on mappings_tmp (valuemapid);
 
 insert into mappings_tmp select * from mappings;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/media.sql b/upgrades/dbpatches/1.3/mysql/patch/media.sql
index 9824f68b..00540275 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/media.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/media.sql
@@ -7,7 +7,7 @@ CREATE TABLE media_tmp (
 	severity		integer		DEFAULT '63'	NOT NULL,
 	period		varchar(100)		DEFAULT '1-7,00:00-23:59'	NOT NULL,
 	PRIMARY KEY (mediaid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX media_1 on media_tmp (userid);
 CREATE INDEX media_2 on media_tmp (mediatypeid);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/media_type.sql b/upgrades/dbpatches/1.3/mysql/patch/media_type.sql
index dccddeb0..d2804a43 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/media_type.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/media_type.sql
@@ -8,7 +8,7 @@ CREATE TABLE media_type_tmp (
 	exec_path		varchar(255)		DEFAULT ''	NOT NULL,
 	gsm_modem		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (mediatypeid)
-);
+) ENGINE=InnoDB;
 
 insert into media_type_tmp select * from media_type;
 drop table media_type;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/node_cksum.sql b/upgrades/dbpatches/1.3/mysql/patch/node_cksum.sql
index cd675a76..6e8752a7 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/node_cksum.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/node_cksum.sql
@@ -7,5 +7,5 @@ CREATE TABLE node_cksum (
 	cksumtype		integer		DEFAULT '0'	NOT NULL,
 	cksum		char(32)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (cksumid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX node_cksum_cksum_1 on node_cksum (nodeid,tablename,fieldname,recordid,cksumtype);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/node_configlog.sql b/upgrades/dbpatches/1.3/mysql/patch/node_configlog.sql
index f80f9b25..121d5737 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/node_configlog.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/node_configlog.sql
@@ -7,6 +7,6 @@ CREATE TABLE node_configlog (
 	sync_master		integer		DEFAULT '0'	NOT NULL,
 	sync_slave		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (nodeid,conflogid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX node_configlog_configlog_1 on node_configlog (conflogid);
 CREATE INDEX node_configlog_configlog_2 on node_configlog (nodeid,tablename);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/nodes.sql b/upgrades/dbpatches/1.3/mysql/patch/nodes.sql
index 88acf5ed..9a59d281 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/nodes.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/nodes.sql
@@ -15,4 +15,4 @@ CREATE TABLE nodes (
 	nodetype		integer		DEFAULT '0'	NOT NULL,
 	masterid		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (nodeid)
-);
+) ENGINE=InnoDB;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/profiles.sql b/upgrades/dbpatches/1.3/mysql/patch/profiles.sql
index b7f4d690..ba8e374d 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/profiles.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/profiles.sql
@@ -5,7 +5,7 @@ CREATE TABLE profiles_tmp (
 	value		varchar(255)		DEFAULT ''	NOT NULL,
 	valuetype		integer		DEFAULT 0	NOT NULL,
 	PRIMARY KEY (profileid)
-);
+) ENGINE=InnoDB;
 CREATE UNIQUE INDEX profiles_1 on profiles_tmp (userid,idx);
 
 insert into profiles_tmp select NULL,userid,idx,value,valuetype from profiles;
@@ -19,7 +19,7 @@ CREATE TABLE profiles_tmp (
 	value		varchar(255)		DEFAULT ''	NOT NULL,
 	valuetype		integer		DEFAULT 0	NOT NULL,
 	PRIMARY KEY (profileid)
-);
+) ENGINE=InnoDB;
 CREATE UNIQUE INDEX profiles_1 on profiles_tmp (userid,idx);
 
 insert into profiles_tmp select * from profiles;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/rights.sql b/upgrades/dbpatches/1.3/mysql/patch/rights.sql
index 45d46cb5..d009ecf2 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/rights.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/rights.sql
@@ -5,7 +5,7 @@ CREATE TABLE rights_tmp (
 	permission		integer		DEFAULT '0'	NOT NULL,
 	id		bigint unsigned			,
 	PRIMARY KEY (rightid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX rights_1 on rights_tmp (groupid);
 
 insert into rights_tmp select * from rights;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/screens.sql b/upgrades/dbpatches/1.3/mysql/patch/screens.sql
index 95a95626..6c55a4be 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/screens.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/screens.sql
@@ -4,7 +4,7 @@ CREATE TABLE screens_tmp (
 	hsize		integer		DEFAULT '1'	NOT NULL,
 	vsize		integer		DEFAULT '1'	NOT NULL,
 	PRIMARY KEY (screenid)
-);
+) ENGINE=InnoDB;
 
 insert into screens_tmp select * from screens;
 drop table screens;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/screens_items.sql b/upgrades/dbpatches/1.3/mysql/patch/screens_items.sql
index 50e315cf..2dabadae 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/screens_items.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/screens_items.sql
@@ -15,7 +15,7 @@ CREATE TABLE screens_items_tmp (
 	style		integer		DEFAULT '0'	NOT NULL,
 	url		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (screenitemid)
-);
+) ENGINE=InnoDB;
 
 insert into screens_items_tmp select NULL,screenid,resourcetype,resourceid,width,height,x,y,colspan,rowspan,elements,valign,halign,style,url from screens_items;
 drop table screens_items;
@@ -38,7 +38,7 @@ CREATE TABLE screens_items_tmp (
 	style		integer		DEFAULT '0'	NOT NULL,
 	url		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (screenitemid)
-);
+) ENGINE=InnoDB;
 
 insert into screens_items_tmp select * from screens_items;
 drop table screens_items;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/service_alarms.sql b/upgrades/dbpatches/1.3/mysql/patch/service_alarms.sql
index 06e50412..61b02bc9 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/service_alarms.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/service_alarms.sql
@@ -4,7 +4,7 @@ CREATE TABLE service_alarms_tmp (
 	clock		integer		DEFAULT '0'	NOT NULL,
 	value		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (servicealarmid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX service_alarms_1 on service_alarms_tmp (serviceid,clock);
 CREATE INDEX service_alarms_2 on service_alarms_tmp (clock);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/services.sql b/upgrades/dbpatches/1.3/mysql/patch/services.sql
index a17b7c48..d6578969 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/services.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/services.sql
@@ -8,7 +8,7 @@ CREATE TABLE services_tmp (
 	goodsla		double(5,2)		DEFAULT '99.9'	NOT NULL,
 	sortorder		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (serviceid)
-);
+) ENGINE=InnoDB;
 
 insert into services_tmp select * from services;
 drop table services;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/services_links.sql b/upgrades/dbpatches/1.3/mysql/patch/services_links.sql
index 633f5d31..0eadfb2a 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/services_links.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/services_links.sql
@@ -4,7 +4,7 @@ CREATE TABLE services_links_tmp (
 	servicedownid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	soft		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (linkid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX services_links_links_1 on services_links_tmp (servicedownid);
 CREATE UNIQUE INDEX services_links_links_2 on services_links_tmp (serviceupid,servicedownid);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/services_times.sql b/upgrades/dbpatches/1.3/mysql/patch/services_times.sql
index 444a26d1..1e8190a2 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/services_times.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/services_times.sql
@@ -6,5 +6,5 @@ CREATE TABLE services_times (
 	ts_to		integer		DEFAULT '0'	NOT NULL,
 	note		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (timeid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX services_times_times_1 on services_times (serviceid,type,ts_from,ts_to);
diff --git a/upgrades/dbpatches/1.3/mysql/patch/sessions.sql b/upgrades/dbpatches/1.3/mysql/patch/sessions.sql
index fc47be47..55d4a669 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/sessions.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/sessions.sql
@@ -3,7 +3,7 @@ CREATE TABLE sessions_tmp (
 	userid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	lastaccess		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (sessionid)
-);
+) ENGINE=InnoDB;
 
 insert into sessions_tmp select * from sessions;
 drop table sessions;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/sysmaps.sql b/upgrades/dbpatches/1.3/mysql/patch/sysmaps.sql
index 2f8d2338..b357e8e8 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/sysmaps.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/sysmaps.sql
@@ -7,7 +7,7 @@ CREATE TABLE sysmaps_tmp (
 	label_type		integer		DEFAULT '0'	NOT NULL,
 	label_location		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (sysmapid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX sysmaps_1 on sysmaps_tmp (name);
 
 insert into sysmaps_tmp select * from sysmaps;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/sysmaps_elements.sql b/upgrades/dbpatches/1.3/mysql/patch/sysmaps_elements.sql
index 51d17c9e..4d6f8a72 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/sysmaps_elements.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/sysmaps_elements.sql
@@ -11,7 +11,7 @@ CREATE TABLE sysmaps_elements_tmp (
 	y		integer		DEFAULT '0'	NOT NULL,
 	url		varchar(255)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (selementid)
-);
+) ENGINE=InnoDB;
 
 insert into sysmaps_elements_tmp select * from sysmaps_elements;
 drop table sysmaps_elements;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/sysmaps_links.sql b/upgrades/dbpatches/1.3/mysql/patch/sysmaps_links.sql
index d8818401..f0e4ffef 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/sysmaps_links.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/sysmaps_links.sql
@@ -9,7 +9,7 @@ CREATE TABLE sysmaps_links_tmp (
 	drawtype_on		integer		DEFAULT '0'	NOT NULL,
 	color_on		varchar(32)		DEFAULT 'Red'	NOT NULL,
 	PRIMARY KEY (linkid)
-);
+) ENGINE=InnoDB;
 
 insert into sysmaps_links_tmp select * from sysmaps_links;
 drop table sysmaps_links;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/trends.sql b/upgrades/dbpatches/1.3/mysql/patch/trends.sql
index 06bdafab..8694167a 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/trends.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/trends.sql
@@ -6,7 +6,7 @@ CREATE TABLE trends_tmp (
 	value_avg		double(16,4)		DEFAULT '0.0000'	NOT NULL,
 	value_max		double(16,4)		DEFAULT '0.0000'	NOT NULL,
 	PRIMARY KEY (itemid,clock)
-);
+) ENGINE=InnoDB;
 
 insert into trends_tmp select * from trends;
 drop table trends;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/trigger_depends.sql b/upgrades/dbpatches/1.3/mysql/patch/trigger_depends.sql
index 23ed223a..193de545 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/trigger_depends.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/trigger_depends.sql
@@ -3,7 +3,7 @@ CREATE TABLE trigger_depends_tmp (
 	triggerid_down		bigint unsigned		DEFAULT '0'	NOT NULL,
 	triggerid_up		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (triggerdepid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX trigger_depends_1 on trigger_depends_tmp (triggerid_down,triggerid_up);
 CREATE INDEX trigger_depends_2 on trigger_depends_tmp (triggerid_up);
 
@@ -16,7 +16,7 @@ CREATE TABLE trigger_depends_tmp (
 	triggerid_down		bigint unsigned		DEFAULT '0'	NOT NULL,
 	triggerid_up		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (triggerdepid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX trigger_depends_1 on trigger_depends_tmp (triggerid_down,triggerid_up);
 CREATE INDEX trigger_depends_2 on trigger_depends_tmp (triggerid_up);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/triggers.sql b/upgrades/dbpatches/1.3/mysql/patch/triggers.sql
index dd7d8171..1d03e406 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/triggers.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/triggers.sql
@@ -12,7 +12,7 @@ CREATE TABLE triggers_tmp (
 	error		varchar(128)		DEFAULT ''	NOT NULL,
 	templateid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (triggerid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX triggers_1 on triggers_tmp (status);
 CREATE INDEX triggers_2 on triggers_tmp (value);
 
diff --git a/upgrades/dbpatches/1.3/mysql/patch/users.sql b/upgrades/dbpatches/1.3/mysql/patch/users.sql
index 9d15cb91..fcad30a5 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/users.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/users.sql
@@ -10,7 +10,7 @@ CREATE TABLE users_tmp (
 	refresh		integer		DEFAULT '30'	NOT NULL,
 	type		integer		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (userid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX users_1 on users_tmp (alias);
 
 insert into users_tmp select userid,alias,name,surname,passwd,url,autologout,lang,refresh,3 from users;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/users_groups.sql b/upgrades/dbpatches/1.3/mysql/patch/users_groups.sql
index 41bf0c6f..1b45595b 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/users_groups.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/users_groups.sql
@@ -3,7 +3,7 @@ CREATE TABLE users_groups_tmp (
 	usrgrpid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	userid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 CREATE INDEX users_groups_1 on users_groups_tmp (usrgrpid,userid);
 
 insert into users_groups_tmp select NULL,usrgrpid,userid from users_groups;
@@ -15,7 +15,7 @@ CREATE TABLE users_groups_tmp (
 	usrgrpid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	userid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (id)
-);
+) ENGINE=InnoDB;
 CREATE INDEX users_groups_1 on users_groups_tmp (usrgrpid,userid);
 
 insert into users_groups_tmp select * from users_groups;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/usrgrp.sql b/upgrades/dbpatches/1.3/mysql/patch/usrgrp.sql
index 2106ddfb..07655751 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/usrgrp.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/usrgrp.sql
@@ -2,7 +2,7 @@ CREATE TABLE usrgrp_tmp (
 	usrgrpid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	name		varchar(64)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (usrgrpid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX usrgrp_1 on usrgrp (name);
 
 insert into usrgrp_tmp select * from usrgrp;
diff --git a/upgrades/dbpatches/1.3/mysql/patch/valuemaps.sql b/upgrades/dbpatches/1.3/mysql/patch/valuemaps.sql
index 296faa8e..9febba47 100644
--- a/upgrades/dbpatches/1.3/mysql/patch/valuemaps.sql
+++ b/upgrades/dbpatches/1.3/mysql/patch/valuemaps.sql
@@ -2,7 +2,7 @@ CREATE TABLE valuemaps_tmp (
 	valuemapid		bigint unsigned		DEFAULT '0'	NOT NULL,
 	name		varchar(64)		DEFAULT ''	NOT NULL,
 	PRIMARY KEY (valuemapid)
-);
+) ENGINE=InnoDB;
 CREATE INDEX valuemaps_1 on valuemaps_tmp (name);
 
 insert into valuemaps_tmp select * from valuemaps;