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.3 to ad29ce9
Date Sun, 22 Feb 2015 20:33:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 82ef390c2 -> ad29ce934


db: use explicit USE statements to avoid SQL failures

create-schema-premium.sql may fail with certain MySQL/MariaDB version which
require explicit database use.

(cherry picked from commit 09e26c826f3942946a9e3cbd0c632fc0c7791e56)
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/ad29ce93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad29ce93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad29ce93

Branch: refs/heads/4.3
Commit: ad29ce93449ee5ee3e07483e531887237058613f
Parents: 82ef390
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Mon Feb 23 02:00:18 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Feb 23 02:03:35 2015 +0530

----------------------------------------------------------------------
 setup/db/create-schema-premium.sql | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad29ce93/setup/db/create-schema-premium.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema-premium.sql b/setup/db/create-schema-premium.sql
index a8feff4..3c86710 100644
--- a/setup/db/create-schema-premium.sql
+++ b/setup/db/create-schema-premium.sql
@@ -16,6 +16,7 @@
 -- under the License.
 
 SET foreign_key_checks = 0;
+USE `cloud_usage`;
 DROP TABLE IF EXISTS `cloud_usage`.`cloud_usage`;
 DROP TABLE IF EXISTS `cloud_usage`.`usage_vm_instance`;
 DROP TABLE IF EXISTS `cloud_usage`.`usage_ip_address`;
@@ -282,6 +283,8 @@ ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX `i_usage_security_gro
 ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX `i_usage_security_group__created`(`created`);
 ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX `i_usage_security_group__deleted`(`deleted`);
 
+USE `cloud`;
+
 CREATE TABLE `cloud`.`netapp_volume` (
   `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
   `ip_address` varchar(255) NOT NULL COMMENT 'ip address/fqdn of the volume',


Mime
View raw message