From 37c1401ad3306c4b359c61f8b9ac2d49838662cb Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Tue, 19 Jul 2011 10:15:14 -0700 Subject: [PATCH] bug 10756: propagate to 2.2.8.z --- setup/db/create-schema.sql | 3 --- setup/db/db/schema-227to228.sql | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index de8132e4212..622c123a1d3 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -1037,11 +1037,8 @@ CREATE TABLE `cloud`.`op_host_capacity` ( `capacity_type` int(1) unsigned NOT NULL, PRIMARY KEY (`id`), INDEX `i_op_host_capacity__host_type`(`host_id`, `capacity_type`), - CONSTRAINT `fk_op_host_capacity__pod_id` FOREIGN KEY (`pod_id`) REFERENCES `host_pod_ref` (`id`) ON DELETE CASCADE, INDEX `i_op_host_capacity__pod_id`(`pod_id`), - CONSTRAINT `fk_op_host_capacity__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE, INDEX `i_op_host_capacity__data_center_id`(`data_center_id`), - CONSTRAINT `fk_op_host_capacity__cluster_id` FOREIGN KEY `fk_op_host_capacity__cluster_id` (`cluster_id`) REFERENCES `cloud`.`cluster`(`id`) ON DELETE CASCADE, INDEX `i_op_host_capacity__cluster_id`(`cluster_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/setup/db/db/schema-227to228.sql b/setup/db/db/schema-227to228.sql index 5a0cb1e5522..bf284d71c9f 100644 --- a/setup/db/db/schema-227to228.sql +++ b/setup/db/db/schema-227to228.sql @@ -145,3 +145,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state', 'Auto', 'console proxy service management state'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state.last', 'Auto', 'last console proxy service management state'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'cluster.message.timeout.seconds', '300', 'Time (in seconds) to wait before a inter-management server message post times out.'); + +ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__pod_id`; +ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__data_center_id`; +ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__cluster_id`;