- [DEV-137] updated version to 1.5.3 (Alexei)base-1.5.3

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

10 files changed, 42 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index d82a885e..5963e5ac 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/zabbix_server/server.c)
-AM_INIT_AUTOMAKE([zabbix],[1.5.2])
+AM_INIT_AUTOMAKE([zabbix],[1.5.3])
 
 AC_MSG_NOTICE([Configuring $PACKAGE_NAME $PACKAGE_VERSION])
 
diff --git a/include/common.h b/include/common.h
index e1372b67..751fb0af 100644
--- a/include/common.h
+++ b/include/common.h
@@ -121,8 +121,8 @@
 #define OFF	0
 
 #define	APPLICATION_NAME	"ZABBIX Agent"
-#define	ZABBIX_REVDATE		"29 April 2008"
-#define	ZABBIX_VERSION		"1.5.2"
+#define	ZABBIX_REVDATE		"4 June 2008"
+#define	ZABBIX_VERSION		"1.5.3"
 
 #if defined(_WINDOWS)
 extern char ZABBIX_SERVICE_NAME[64];
diff --git a/upgrades/dbpatches/1.6/mysql/patch/actions.sql b/upgrades/dbpatches/1.6/mysql/patch/actions.sql
new file mode 100644
index 00000000..b7542e69
--- /dev/null
+++ b/upgrades/dbpatches/1.6/mysql/patch/actions.sql
@@ -0,0 +1,6 @@
+alter table actions add        esc_period              integer         DEFAULT '0'     NOT NULL;
+alter table actions add        def_shortdata           varchar(255)            DEFAULT ''      NOT NULL;
+alter table actions add        def_longdata            blob            DEFAULT ''      NOT NULL;
+alter table actions add        recovery_msg            integer         DEFAULT '0'     NOT NULL;
+alter table actions add        r_shortdata             varchar(255)            DEFAULT ''      NOT NULL;
+alter table actions add        r_longdata              blob            DEFAULT ''      NOT NULL;
diff --git a/upgrades/dbpatches/1.6/mysql/patch/alerts.sql b/upgrades/dbpatches/1.6/mysql/patch/alerts.sql
index f69c3dbf..0615db57 100644
--- a/upgrades/dbpatches/1.6/mysql/patch/alerts.sql
+++ b/upgrades/dbpatches/1.6/mysql/patch/alerts.sql
@@ -1,6 +1,9 @@
 alter table alerts drop index alerts_3;
 alter table alerts drop triggerid;
 alter table alerts add eventid bigint(20) unsigned NOT NULL default '0';
+alter table alerts add esc_step integer DEFAULT '0'     NOT NULL;
+alter table alerts add alerttype integer DEFAULT '0'     NOT NULL;
+
 CREATE INDEX alerts_3 on alerts (eventid);
 
 update alerts set status=3 where retries>=2;
diff --git a/upgrades/dbpatches/1.6/mysql/patch/escalations.sql b/upgrades/dbpatches/1.6/mysql/patch/escalations.sql
new file mode 100644
index 00000000..78ffe299
--- /dev/null
+++ b/upgrades/dbpatches/1.6/mysql/patch/escalations.sql
@@ -0,0 +1,11 @@
+CREATE TABLE escalations (
+        escalationid            bigint unsigned         DEFAULT '0'     NOT NULL,
+        actionid                bigint unsigned         DEFAULT '0'     NOT NULL,
+        triggerid               bigint unsigned         DEFAULT '0'     NOT NULL,
+        eventid         bigint unsigned         DEFAULT '0'     NOT NULL,
+        nextcheck               integer         DEFAULT '0'     NOT NULL,
+        esc_step                integer         DEFAULT '0'     NOT NULL,
+        status          integer         DEFAULT '0'     NOT NULL,
+        PRIMARY KEY (escalationid)
+) type=InnoDB;
+CREATE INDEX escalations_1 on escalations (actionid,triggerid);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/items.sql b/upgrades/dbpatches/1.6/mysql/patch/items.sql
new file mode 100644
index 00000000..da6606b2
--- /dev/null
+++ b/upgrades/dbpatches/1.6/mysql/patch/items.sql
@@ -0,0 +1 @@
+CREATE INDEX items_4 on items (templateid);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/opconditions.sql b/upgrades/dbpatches/1.6/mysql/patch/opconditions.sql
new file mode 100644
index 00000000..0028cf5d
--- /dev/null
+++ b/upgrades/dbpatches/1.6/mysql/patch/opconditions.sql
@@ -0,0 +1,9 @@
+CREATE TABLE opconditions (
+        opconditionid           bigint unsigned         DEFAULT '0'     NOT NULL,
+        operationid             bigint unsigned         DEFAULT '0'     NOT NULL,
+        conditiontype           integer         DEFAULT '0'     NOT NULL,
+        operator                integer         DEFAULT '0'     NOT NULL,
+        value           varchar(255)            DEFAULT ''      NOT NULL,
+        PRIMARY KEY (opconditionid)
+) type=InnoDB;
+CREATE INDEX opconditions_1 on opconditions (operationid);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/operations.sql b/upgrades/dbpatches/1.6/mysql/patch/operations.sql
new file mode 100644
index 00000000..c83520d0
--- /dev/null
+++ b/upgrades/dbpatches/1.6/mysql/patch/operations.sql
@@ -0,0 +1,5 @@
+alter table operations add        esc_period              integer         DEFAULT '0'     NOT NULL;
+alter table operations add        esc_step_from           integer         DEFAULT '0'     NOT NULL;
+alter table operations add        esc_step_to             integer         DEFAULT '0'     NOT NULL;
+alter table operations add        default_msg             integer         DEFAULT '0'     NOT NULL;
+alter table operations add        evaltype                integer         DEFAULT '0'     NOT NULL;
diff --git a/upgrades/dbpatches/1.6/mysql/patch/profiles.sql b/upgrades/dbpatches/1.6/mysql/patch/profiles.sql
index 753ff69b..bbd620b6 100644
--- a/upgrades/dbpatches/1.6/mysql/patch/profiles.sql
+++ b/upgrades/dbpatches/1.6/mysql/patch/profiles.sql
@@ -3,5 +3,5 @@ delete from profiles;
 alter table profiles drop index profiles_1;
 
 alter table profiles add value2          varchar(255)            DEFAULT ''      NOT NULL;
-alter table profiles add resource        varchar(255)            DEFAULT ''      NOT NULL;
+alter table profiles add source        varchar(255)            DEFAULT ''      NOT NULL;
 CREATE INDEX profiles_1 on profiles (idx);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/scripts.sql b/upgrades/dbpatches/1.6/mysql/patch/scripts.sql
index 7a6823b4..014e101e 100644
--- a/upgrades/dbpatches/1.6/mysql/patch/scripts.sql
+++ b/upgrades/dbpatches/1.6/mysql/patch/scripts.sql
@@ -3,5 +3,8 @@ CREATE TABLE scripts (
         name            varchar(255)            DEFAULT ''      NOT NULL,
         command         varchar(255)            DEFAULT ''      NOT NULL,
         host_access             integer         DEFAULT '0'     NOT NULL,
+	usrgrpid                bigint unsigned         DEFAULT '0'     NOT NULL,
+	groupid         bigint unsigned         DEFAULT '0'     NOT NULL,
+
         PRIMARY KEY (scriptid)
 ) type=InnoDB;