Author: arkurth
Date: Fri Sep 17 18:38:58 2010
New Revision: 998239
URL: http://svn.apache.org/viewvc?rev=998239&view=rev
Log:
VCL-357
Updated vcl.sql and update-2.2.sql. Added entry to module table for the base
module. Fixed a bug in the AddIndexIfNotExists procedure in update-2.2.sql
which caused multiple indexes to be added.
Modified:
incubator/vcl/trunk/mysql/update-2.2.sql
incubator/vcl/trunk/mysql/vcl.sql
Modified: incubator/vcl/trunk/mysql/update-2.2.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-2.2.sql?rev=998239&r1=998238&r2=998239&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/update-2.2.sql (original)
+++ incubator/vcl/trunk/mysql/update-2.2.sql Fri Sep 17 18:38:58 2010
@@ -91,10 +91,10 @@ CREATE PROCEDURE `AddIndexIfNotExists`(
)
BEGIN
IF NOT EXISTS (
- SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE
+ SELECT * FROM information_schema.STATISTICS WHERE
TABLE_SCHEMA=Database()
- AND COLUMN_NAME=columnName
AND TABLE_NAME=tableName
+ AND COLUMN_NAME=columnName
)
THEN
SET @statement_array = CONCAT('ALTER TABLE ', Database(), '.', tableName,
' ADD INDEX (', columnName, ')');
@@ -394,6 +394,7 @@ INSERT IGNORE INTO `module` (`name`, `pr
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_xcat_2x', 'xCAT 2.x Provisioning Module',
'', 'VCL::Module::Provisioning::xCAT2');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_vmware', 'VMware Provisioning Module', '',
'VCL::Module::Provisioning::VMware::VMware');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('state_image', 'VCL Image State Module', '',
'VCL::image');
+INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('base_module', 'VCL Base Module', '', 'VCL::Module');
-- --------------------------------------------------------
Modified: incubator/vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/vcl.sql?rev=998239&r1=998238&r2=998239&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/vcl.sql (original)
+++ incubator/vcl/trunk/mysql/vcl.sql Fri Sep 17 18:38:58 2010
@@ -1273,7 +1273,8 @@ INSERT INTO `module` (`id`, `name`, `pre
(17, 'os_win7', 'Windows 7 OS Module', '',
'VCL::Module::OS::Windows::Version_6::7'),
(20, 'provisioning_xCAT_2x', 'xCAT 2.x Provisioning Module', '',
'VCL::Module::Provisioning::xCAT2'),
(21, 'provisioning_vmware', 'VMware Provisioning Module', '',
'VCL::Module::Provisioning::VMware::VMware'),
-(22, 'state_image', 'VCL Image State Module', '', 'VCL::image');
+(22, 'state_image', 'VCL Image State Module', '', 'VCL::image'),
+(23, 'base_module', 'VCL Base Module', '', 'VCL::Module');
--
-- Dumping data for table `OS`
