Author: jfthomps
Date: Thu Jun 22 17:37:21 2017
New Revision: 1799598
URL: http://svn.apache.org/viewvc?rev=1799598&view=rev
Log:
VCL-1053 - Prepare VCL 2.5 release
update-vcl.sql: modified procedure moveConnectMethodPortProtocol: added "WHERE
port != 0" to last INSERT statement to handle upgrades from VCL versions
without any connectmethod tables. I saw a problem upgrading from 2.2.2 where it
caused 3 entries to be inserted with port set to 0. Then, a later query in the
update-vcl.sql script caused 3 more entries to be inserted with the correct
port numbers resulting in 2 entries for each connect method with one having the
right port and one having 0.
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=1799598&r1=1799597&r2=1799598&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Thu Jun 22 17:37:21 2017
@@ -702,7 +702,7 @@ BEGIN
AND TABLE_NAME='connectmethod'
)
THEN
- INSERT INTO connectmethodport (connectmethodid, port, protocol) SELECT
id, port, IFNULL(NULLIF(protocol,''),'TCP') FROM connectmethod;
+ INSERT INTO connectmethodport (connectmethodid, port, protocol) SELECT
id, port, IFNULL(NULLIF(protocol,''),'TCP') FROM connectmethod WHERE port != 0;
CALL DropColumnIfExists('connectmethod', 'port');
CALL DropColumnIfExists('connectmethod', 'protocol');
END IF;
