Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 54AD718026 for ; Wed, 13 May 2015 12:12:52 +0000 (UTC) Received: (qmail 84361 invoked by uid 500); 13 May 2015 12:12:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 84330 invoked by uid 500); 13 May 2015 12:12:52 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 84321 invoked by uid 99); 13 May 2015 12:12:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 12:12:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1840CE0779; Wed, 13 May 2015 12:12:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to 7a4e167 Date: Wed, 13 May 2015 12:12:52 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 7703872bc -> 7a4e16769 schema: fix foreign key checks for 3.0.7 to 4.1.0 upgrade path Without this upgrades from 3.0.7 version fails. Signed-off-by: Rohit Yadav (cherry picked from commit a0cff4ca48bbd2140c35b586d42d997ad5f167b2) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a4e1676 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a4e1676 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a4e1676 Branch: refs/heads/4.4 Commit: 7a4e1676920a0b6b4b2df3a3f02bb49319a0a8dd Parents: 7703872 Author: Rohit Yadav Authored: Wed May 13 14:10:14 2015 +0200 Committer: Rohit Yadav Committed: Wed May 13 14:12:42 2015 +0200 ---------------------------------------------------------------------- setup/db/db/schema-307to410.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a4e1676/setup/db/db/schema-307to410.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-307to410.sql b/setup/db/db/schema-307to410.sql index 7feb53e..5624f00 100644 --- a/setup/db/db/schema-307to410.sql +++ b/setup/db/db/schema-307to410.sql @@ -20,6 +20,7 @@ --; +SET foreign_key_checks = 0; -- DB upgrade steps from 302-40 CREATE TABLE `cloud`.`external_nicira_nvp_devices` ( @@ -1508,7 +1509,6 @@ CREATE TABLE `cloud`.`ucs_manager` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -SET foreign_key_checks = 1; UPDATE `cloud`.`configuration` SET value='KVM,XenServer,VMware,Ovm' WHERE name='hypervisor.list'; @@ -1585,3 +1585,5 @@ ALTER TABLE `cloud_usage`.`cloud_usage` CHANGE COLUMN `virtual_size` `virtual_si ALTER TABLE `cloud`.`network_offerings` CHANGE COLUMN `concurrent_connections` `concurrent_connections1` int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent connections(global max)'; ALTER TABLE `cloud`.`volumes` CHANGE COLUMN `iso_id` `iso_id1` bigint(20) unsigned COMMENT 'The id of the iso from which the volume was created'; + +SET foreign_key_checks = 1;