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 42EC117922 for ; Sun, 22 Feb 2015 20:32:22 +0000 (UTC) Received: (qmail 36460 invoked by uid 500); 22 Feb 2015 20:32:22 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 36425 invoked by uid 500); 22 Feb 2015 20:32:22 -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 36415 invoked by uid 99); 22 Feb 2015 20:32:22 -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; Sun, 22 Feb 2015 20:32:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EF0E7E03FA; Sun, 22 Feb 2015 20:32:21 +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: <5cb6bda095df4c18a76dcc6cb3be6f96@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.5 to b9e0e91 Date: Sun, 22 Feb 2015 20:32:21 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.5 177c19036 -> b9e0e914c 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9e0e914 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9e0e914 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9e0e914 Branch: refs/heads/4.5 Commit: b9e0e914c4cba2d10eae6525d4fbfe2f4823ca28 Parents: 177c190 Author: Rohit Yadav Authored: Mon Feb 23 02:00:18 2015 +0530 Committer: Rohit Yadav Committed: Mon Feb 23 02:02:02 2015 +0530 ---------------------------------------------------------------------- setup/db/create-schema-premium.sql | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9e0e914/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',