summaryrefslogtreecommitdiffstats
path: root/upgrades
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-11 15:45:44 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-11 15:45:44 +0000
commitd718bba52b527b2d5ca3db36bea6231240f9ad0f (patch)
tree29e82c790e7bb2f1b64cd225ca9b456a0833e448 /upgrades
parent5cdc91f40d8fdb6e8c4c525a230565bfa87afb86 (diff)
downloadzabbix-d718bba52b527b2d5ca3db36bea6231240f9ad0f.tar.gz
zabbix-d718bba52b527b2d5ca3db36bea6231240f9ad0f.tar.xz
zabbix-d718bba52b527b2d5ca3db36bea6231240f9ad0f.zip
- [DEV-137] update of upgrade patch (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@5611 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'upgrades')
-rw-r--r--upgrades/dbpatches/1.6/mysql/patch/alerts.sql2
-rw-r--r--upgrades/dbpatches/1.6/mysql/patch/history_log.sql1
-rw-r--r--upgrades/dbpatches/1.6/mysql/patch/history_str_sync.sql1
-rw-r--r--upgrades/dbpatches/1.6/mysql/patch/history_sync.sql1
-rw-r--r--upgrades/dbpatches/1.6/mysql/patch/history_text.sql1
-rw-r--r--upgrades/dbpatches/1.6/mysql/patch/history_uint_sync.sql1
-rw-r--r--upgrades/dbpatches/1.6/mysql/patch/proxy_history.sql12
7 files changed, 13 insertions, 6 deletions
diff --git a/upgrades/dbpatches/1.6/mysql/patch/alerts.sql b/upgrades/dbpatches/1.6/mysql/patch/alerts.sql
index 8bea58d0..f69c3dbf 100644
--- a/upgrades/dbpatches/1.6/mysql/patch/alerts.sql
+++ b/upgrades/dbpatches/1.6/mysql/patch/alerts.sql
@@ -1,4 +1,4 @@
-alter table alerts frop index alerts_3;
+alter table alerts drop index alerts_3;
alter table alerts drop triggerid;
alter table alerts add eventid bigint(20) unsigned NOT NULL default '0';
CREATE INDEX alerts_3 on alerts (eventid);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/history_log.sql b/upgrades/dbpatches/1.6/mysql/patch/history_log.sql
deleted file mode 100644
index 1e3223f1..00000000
--- a/upgrades/dbpatches/1.6/mysql/patch/history_log.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX history_log_2 on history_log (clock);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/history_str_sync.sql b/upgrades/dbpatches/1.6/mysql/patch/history_str_sync.sql
deleted file mode 100644
index 236e827e..00000000
--- a/upgrades/dbpatches/1.6/mysql/patch/history_str_sync.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX history_str_sync_2 on history_str_sync (clock);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/history_sync.sql b/upgrades/dbpatches/1.6/mysql/patch/history_sync.sql
deleted file mode 100644
index f3534c5e..00000000
--- a/upgrades/dbpatches/1.6/mysql/patch/history_sync.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX history_sync_2 on history_sync (clock);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/history_text.sql b/upgrades/dbpatches/1.6/mysql/patch/history_text.sql
deleted file mode 100644
index a583aed9..00000000
--- a/upgrades/dbpatches/1.6/mysql/patch/history_text.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX history_text_2 on history_text (clock);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/history_uint_sync.sql b/upgrades/dbpatches/1.6/mysql/patch/history_uint_sync.sql
deleted file mode 100644
index 8e433e7c..00000000
--- a/upgrades/dbpatches/1.6/mysql/patch/history_uint_sync.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX history_uint_sync_2 on history_uint_sync (clock);
diff --git a/upgrades/dbpatches/1.6/mysql/patch/proxy_history.sql b/upgrades/dbpatches/1.6/mysql/patch/proxy_history.sql
new file mode 100644
index 00000000..c75cd6b4
--- /dev/null
+++ b/upgrades/dbpatches/1.6/mysql/patch/proxy_history.sql
@@ -0,0 +1,12 @@
+CREATE TABLE proxy_history (
+ id bigint unsigned NOT NULL auto_increment unique,
+ host varchar(64) DEFAULT '' NOT NULL,
+ key_ varchar(255) DEFAULT '' NOT NULL,
+ clock integer DEFAULT '0' NOT NULL,
+ timestamp integer DEFAULT '0' NOT NULL,
+ source varchar(64) DEFAULT '' NOT NULL,
+ severity integer DEFAULT '0' NOT NULL,
+ value text DEFAULT '' NOT NULL,
+ PRIMARY KEY (id)
+) type=InnoDB;
+CREATE INDEX proxy_history_1 on proxy_history (clock);