From c4efac20831e5c59a84291fa71c19b59b6456ede Mon Sep 17 00:00:00 2001 From: alena Date: Tue, 13 Sep 2011 11:11:54 -0700 Subject: [PATCH] Added back changed reverted by merge --- setup/db/db/schema-2211to2212.sql | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup/db/db/schema-2211to2212.sql b/setup/db/db/schema-2211to2212.sql index f7dab355755..35631aff68d 100644 --- a/setup/db/db/schema-2211to2212.sql +++ b/setup/db/db/schema-2211to2212.sql @@ -17,6 +17,9 @@ DELETE FROM `cloud`.`configuration` where name='vmware.guest.nic.device.type'; INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.lb.enabled', 'true', 'If agent load balancing enabled in cluster setup'); update `cloud`.`vm_template` set hypervisor_type='XenServer' where unique_name='xs-tools.iso'; - -ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40); - + +ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40); + +ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_accountId`(`type`, `account_id`); +ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_domaintId`(`type`, `domain_id`); +