summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-11 14:34:40 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-11 14:34:40 +0000
commit08e196ce1c67b4c6f4a10b14f09e8924c8e044ea (patch)
tree769150ccca801c826ed38403141ca7cb1674170c
parente196091778c5ea93c9d00301b3ebca85d96d9e09 (diff)
downloadzabbix-08e196ce1c67b4c6f4a10b14f09e8924c8e044ea.tar.gz
zabbix-08e196ce1c67b4c6f4a10b14f09e8924c8e044ea.tar.xz
zabbix-08e196ce1c67b4c6f4a10b14f09e8924c8e044ea.zip
- [ZBX-95] fixed patch.sql to work with buggy PHPMyAdmin (Alexei)
[svn merge -r4854:4857 svn://svn.zabbix.com/branches/1.4] git-svn-id: svn://svn.zabbix.com/trunk@4858 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--upgrades/dbpatches/1.4/mysql/patch/rights.sql2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a9afec2..39c072b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Changes for 1.5:
Changes for 1.4.3:
+ - [ZBX-95] fixed patch.sql to work with buggy PHPMyAdmin (Alexei)
- [ZBX-59] removed button "Switch Node" (Alexei)
- [ZBX-19] fixed SMS sending (Sasha)
- [DEV-46] added "save&return" button in acknowledgement (Artem)
diff --git a/upgrades/dbpatches/1.4/mysql/patch/rights.sql b/upgrades/dbpatches/1.4/mysql/patch/rights.sql
index 6d737ea9..3f62ae80 100644
--- a/upgrades/dbpatches/1.4/mysql/patch/rights.sql
+++ b/upgrades/dbpatches/1.4/mysql/patch/rights.sql
@@ -8,6 +8,6 @@ CREATE TABLE rights_tmp (
) ENGINE=InnoDB;
CREATE INDEX rights_1 on rights_tmp (groupid);
---insert into rights_tmp select * from rights;
+-- insert into rights_tmp select * from rights;
drop table rights;
alter table rights_tmp rename rights;