svn commit: r1656564 - /vcl/trunk/mysql/update-vcl.sql

[jfthomps]

Author: jfthomps
Date: Mon Feb  2 20:44:19 2015
New Revision: 1656564

URL: http://svn.apache.org/r1656564
Log:
VCL-764 - Database changes for VCL 2.4

update-vcl.sql: modified Add3ColUniqueIndexIfNotExist: added "AND NON_UNIQUE = 
1" to sql statement that gets list of existing non-unique indices; added "AND 
NON_UNIQUE = 0" to sql statement that checks to see if any existing unique 
indices are already there

Modified:
    vcl/trunk/mysql/update-vcl.sql

Modified: vcl/trunk/mysql/update-vcl.sql
URL: 
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1656564&r1=1656563&r2=1656564&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Mon Feb  2 20:44:19 2015
@@ -602,7 +602,8 @@ BEGIN
     AND i2.INDEX_NAME = i1.INDEX_NAME
     AND i2.SEQ_IN_INDEX = 2
     AND i2.COLUMN_NAME IN (columnName1, columnName2, columnName3)
-    AND (i3.COLUMN_NAME IS NULL OR i3.COLUMN_NAME IN (columnName1, 
columnName2, columnName3));
+    AND (i3.COLUMN_NAME IS NULL OR i3.COLUMN_NAME IN (columnName1, 
columnName2, columnName3))
+    AND i1.NON_UNIQUE = 1;
 
   DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
 
@@ -653,6 +654,7 @@ BEGIN
     AND i1.COLUMN_NAME IN (columnName1, columnName2, columnName3)
     AND i2.COLUMN_NAME IN (columnName1, columnName2, columnName3)
     AND i3.COLUMN_NAME IN (columnName1, columnName2, columnName3)
+    AND i1.NON_UNIQUE = 0
   )
   THEN
     IF deleteduplicates = 1 THEN