[vcl] branch develop updated: VCL-1081 - UID conflict for admin user

[jfthomps]

This is an automated email from the ASF dual-hosted git repository.

jfthomps pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/vcl.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5abdb11  VCL-1081 - UID conflict for admin user
     new ed269c3  Merge branch 'develop' of 
https://gitbox.apache.org/repos/asf/vcl into develop
5abdb11 is described below

commit 5abdb11879bc7d75ea927aa648e2bf9b77ccedfc
Author: Josh Thompson <jftho...@ncsu.edu>
AuthorDate: Fri Feb 1 12:02:09 2019 -0500

    VCL-1081 - UID conflict for admin user
    
    vcl.sql: changed UID for admin user to NULL to prevent conflicts with 
existing UIDs on systems
---
 mysql/vcl.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql/vcl.sql b/mysql/vcl.sql
index 00a4418..a5e41b1 100644
--- a/mysql/vcl.sql
+++ b/mysql/vcl.sql
@@ -2103,7 +2103,7 @@ INSERT IGNORE INTO `state` (`id`, `name`) VALUES
 -- 
 
 INSERT IGNORE INTO `user` (`id`, `uid`, `unityid`, `affiliationid`, 
`firstname`, `lastname`, `preferredname`, `email`, `emailnotices`, `IMtypeid`, 
`IMid`, `adminlevelid`, `width`, `height`, `bpp`, `audiomode`, `mapdrives`, 
`mapprinters`, `mapserial`, `showallgroups`, `lastupdated`) VALUES 
-(1, 101, 'admin', 1, 'vcl', 'admin', '', 'root@localhost', 0, NULL, NULL, 3, 
1024, 768, 16, 'local', 1, 1, 1, 1, '2007-05-17 09:58:39'),
+(1, NULL, 'admin', 1, 'vcl', 'admin', '', 'root@localhost', 0, NULL, NULL, 3, 
1024, 768, 16, 'local', 1, 1, 1, 1, '2007-05-17 09:58:39'),
 (2, NULL, 'vclreload', 1, 'vcl', 'reload', NULL, '', 0, NULL, NULL, 1, 1024, 
768, 16, 'local', 1, 1, 0, 0, '0000-00-00 00:00:00'),
 (3, NULL, 'vclsystem', 1, 'vcl', 'system', NULL, '', 0, NULL, NULL, 1, 1024, 
768, 16, 'local', 1, 1, 0, 0, '0000-00-00 00:00:00');