cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.5 to 7055b22
Date Fri, 14 Aug 2015 07:46:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 5f06ef77d -> 7055b2280


CLOUDSTACK-8696: Port Rajani's regions fix to 451to452 sql upgrade path

Upgrade paths from 4.5.1 exists to both 4.5.2, and 4.6.0. Since 4.5.2 and 4.6.0
are not release, and the bug affects 4.5 branch; this patch aims to port that
fix from master to both 4.5/master branches.

Ported from commit b6a7804

(cherry picked from commit a8af6f3658ded6e1c3538082fb4abeb7f30c420d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7055b228
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7055b228
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7055b228

Branch: refs/heads/4.5
Commit: 7055b2280f9cc7b20d7ab66cebade705b2a105b8
Parents: 5f06ef7
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Aug 14 13:12:29 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Aug 14 13:16:37 2015 +0530

----------------------------------------------------------------------
 setup/db/db/schema-451to452.sql | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7055b228/setup/db/db/schema-451to452.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-451to452.sql b/setup/db/db/schema-451to452.sql
index 5c89008..d0aeabf 100644
--- a/setup/db/db/schema-451to452.sql
+++ b/setup/db/db/schema-451to452.sql
@@ -33,3 +33,7 @@ CREATE TABLE `cloud`.`saml_token` (
   PRIMARY KEY (`id`),
   CONSTRAINT `fk_saml_token__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`)
ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+SET foreign_key_checks = 0;
+ALTER TABLE `cloud`.`region` MODIFY `id` int unsigned UNIQUE NOT NULL;
+SET foreign_key_checks = 1;


Mime
View raw message