- fixed linkage of applications in 1.1.x migration scripts (Alexei)

 - fixed permissiong of Admin in 1.1.x migration scripts (Alexei)


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

2 files changed, 2 insertions, 2 deletions

diff --git a/upgrades/dbpatches/1.4/mysql/patch/items_applications.sql b/upgrades/dbpatches/1.4/mysql/patch/items_applications.sql
index 92178eb7..6d02fd7d 100644
--- a/upgrades/dbpatches/1.4/mysql/patch/items_applications.sql
+++ b/upgrades/dbpatches/1.4/mysql/patch/items_applications.sql
@@ -6,7 +6,7 @@ CREATE TABLE items_applications_tmp (
 ) 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;
+insert into items_applications_tmp select NULL,applicationid,itemid from items_applications;
 drop table items_applications;
 alter table items_applications_tmp rename items_applications;
 
diff --git a/upgrades/dbpatches/1.4/mysql/patch/users.sql b/upgrades/dbpatches/1.4/mysql/patch/users.sql
index c2a31e17..03ff99ff 100644
--- a/upgrades/dbpatches/1.4/mysql/patch/users.sql
+++ b/upgrades/dbpatches/1.4/mysql/patch/users.sql
@@ -14,6 +14,6 @@ CREATE TABLE users_tmp (
 CREATE INDEX users_1 on users_tmp (alias);
 
 insert into users_tmp select userid,alias,name,surname,passwd,url,autologout,lang,refresh,1 from users;
-update users_tmp set type=3 where name='Admin';
+update users_tmp set type=3 where alias='Admin';
 drop table users;
 alter table users_tmp rename users;