Author: jfthomps
Date: Thu Jun 2 21:26:10 2016
New Revision: 1746640
URL: http://svn.apache.org/viewvc?rev=1746640&view=rev
Log:
VCL-843 - Remove "VM limit"
vcl.sql: modified definition for vmhost: removed vmlimit
update-vcl.sql:
-removed ALTER TABLE for vmhost that changed vmlimit
-added CALL DropColumnIfExists for vmhost.vmlimit
Modified:
vcl/trunk/mysql/update-vcl.sql
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1746640&r1=1746639&r2=1746640&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Thu Jun 2 21:26:10 2016
@@ -1461,11 +1461,11 @@ CREATE TABLE IF NOT EXISTS `variable` (
-- Table structure change for table `vmhost`
--
-ALTER TABLE `vmhost` CHANGE `vmlimit` `vmlimit` smallint(5) unsigned NOT NULL;
ALTER TABLE `vmhost` CHANGE `vmprofileid` `vmprofileid` smallint(5) unsigned
NOT NULL;
CALL AddIndexIfNotExists('vmhost', 'vmprofileid');
CALL DropColumnIfExists('vmhost', 'vmkernalnic');
CALL DropColumnIfExists('vmhost', 'vmwaredisk');
+CALL DropColumnIfExists('vmhost', 'vmlimit');
-- have to drop constraint before dropping index
CALL DropExistingConstraints('vmhost', 'computerid');
CALL DropExistingIndices('vmhost', 'computerid');
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1746640&r1=1746639&r2=1746640&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Thu Jun 2 21:26:10 2016
@@ -1414,7 +1414,6 @@ CREATE TABLE IF NOT EXISTS `variable` (
CREATE TABLE IF NOT EXISTS `vmhost` (
`id` smallint(5) unsigned NOT NULL auto_increment,
`computerid` smallint(5) unsigned NOT NULL,
- `vmlimit` smallint(5) unsigned NOT NULL,
`vmprofileid` smallint(5) unsigned NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `computerid_vmprofileid` (`computerid`,`vmprofileid`),
