Author: jfthomps
Date: Fri May 11 18:54:47 2012
New Revision: 1337328
URL: http://svn.apache.org/viewvc?rev=1337328&view=rev
Log:
VCL-576
Finalizing for 2.3 release
update-vcl.sql - (missed this on the last commit) changed key for
computer.eth0macaddress and computer.eth1macaddress to not be unique
Modified:
incubator/vcl/trunk/mysql/update-vcl.sql
Modified: incubator/vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-vcl.sql?rev=1337328&r1=1337327&r2=1337328&view=diff
==============================================================================
--- incubator/vcl/trunk/mysql/update-vcl.sql (original)
+++ incubator/vcl/trunk/mysql/update-vcl.sql Fri May 11 18:54:47 2012
@@ -525,6 +525,10 @@ CALL AddColumnIfNotExists('changelog', '
CALL DropColumnIfExists('computer', 'preferredimageid');
CALL AddIndexIfNotExists('computer', 'imagerevisionid');
+CALL DropExistingIndices('computer', 'eth0macaddress');
+CALL AddIndexIfNotExists('computer', 'eth0macaddress');
+CALL DropExistingIndices('computer', 'eth1macaddress');
+CALL AddIndexIfNotExists('computer', 'eth1macaddress');
-- Set the default values for the currentimage and next image columns to
'noimage'
SET @currentimageid_noimage = CONCAT('ALTER TABLE computer CHANGE
currentimageid currentimageid SMALLINT(5) UNSIGNED NOT NULL DEFAULT ', (SELECT
id FROM image WHERE name LIKE 'noimage'));