From 419faa1f903bc303bcb4b01356d8c561eaee8f2b Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 11 Apr 2012 17:37:06 -0700 Subject: [PATCH] Revert "Fix foreign key "fk_domain_router__element_id" in the upgrade" This reverts commit 52e334cefc7bd41323ab4295101175849d1556e9. Conflicts: setup/db/db/schema-301to302.sql --- setup/db/db/schema-301to302.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/db/db/schema-301to302.sql b/setup/db/db/schema-301to302.sql index 97a4b471e92..7f3cd193174 100755 --- a/setup/db/db/schema-301to302.sql +++ b/setup/db/db/schema-301to302.sql @@ -20,5 +20,5 @@ DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.ram.size'; INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'consoleproxy.service.offering', NULL, 'Service offering used by console proxy; if NULL - system offering will be used'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'secstorage.service.offering', NULL, 'Service offering used by secondary storage; if NULL - system offering will be used'); - -ALTER TABLE `cloud`.`domain_router` ADD CONSTRAINT `fk_domain_router__element_id` FOREIGN KEY `fk_domain_router__element_id`(`element_id`) REFERENCES `virtual_router_providers`(`id`); + +DROP INDEX `i_host__allocation_state` ON `cloud`.`host`;