Produced by Araxis Merge on Mon Jan 24 00:12:20 2005 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.
# | Location | File | Last Modified |
---|---|---|---|
1 | e:\tech\cvs\coppermine\stable-head\sql | update.sql | Wed Jan 5 00:34:18 2005 UTC |
2 | e:\tech\cvs\coppermine\stable\sql | update.sql | Sun Jan 23 23:31:24 2005 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Blocks | Lines | |
Unchanged | 2 | 212 |
Changed | 0 | 0 |
Inserted | 1 | 7 |
Removed | 0 | 0 |
Whitespace | All differences in whitespace within lines are ignored |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Hidden in comparison detail |
No regular expressions were active.
1 | # $Id: update.sql,v 1.13 2005/01/05 00:34:18 nibbler999 Exp $ | 1 | # $Id: update.sql,v 1.13 2005/01/05 00:34:18 nibbler999 Exp $ | |||
2 | 2 | |||||
3 | # | 3 | # | |||
4 | # Table structure for table `CPG_filetypes` | 4 | # Table structure for table `CPG_filetypes` | |||
(108 unchanged lines omitted) | ||||||
113 | INSERT INTO CPG_config VALUES ('email_comment_notification', '0'); | 113 | INSERT INTO CPG_config VALUES ('email_comment_notification', '0'); | |||
114 | INSERT INTO CPG_config VALUES ('enable_zipdownload', '1'); | 114 | INSERT INTO CPG_config VALUES ('enable_zipdownload', '1'); | |||
115 | INSERT INTO CPG_config VALUES ('debug_notice', '0'); | 115 | INSERT INTO CPG_config VALUES ('debug_notice', '0'); | |||
116 | INSERT INTO CPG_config VALUES ('slideshow_interval', '5000'); | 116 | INSERT INTO CPG_config VALUES ('slideshow_interval', '5000'); | |||
117 | INSERT INTO CPG_config VALUES ('safe_mode_mkdir', ''); | |||||
118 | INSERT INTO CPG_config VALUES ('safe_mode_cpg_path', ''); | |||||
119 | INSERT INTO CPG_config VALUES ('exif_ignore1','resolutionUnit|FileName|FileSize|xResolution|yResolution|YCbCrPositioning|exifVersion|sensing|IPTC Copyright|componentConfig|makerNote|flashpixVersion|colorSpace|Width|Height|GPSLatitudeRef|GPSLatitude|customRendered|screenCaptureType|gainControl|'); | |||||
120 | INSERT INTO CPG_config VALUES ('exif_ignore2','contrast|focalPlaneYResolution|sourceType|saturation|sharpness|compressScheme|ThumbnailSize|Thumbnail|IsColor|resolution|color|jpegProcess|Process|FileDateTime|dateTimeDigitized|fileModifiedDate|imageDesc|FlashUsed|aperture|'); | |||||
121 | INSERT INTO CPG_config VALUES ('exif_ignore3',''); | |||||
122 | INSERT INTO CPG_config VALUES ('admin_confirm','0'); | |||||
123 | INSERT INTO CPG_config VALUES ('show_upload_user','0'); | |||||
117 | 124 | |||||
118 | 125 | |||||
119 | # Modify structure for category thumb | 126 | # Modify structure for category thumb | |||
120 | ALTER TABLE `CPG_categories` ADD `thumb` INT NOT NULL AFTER `parent` ; | 127 | ALTER TABLE `CPG_categories` ADD `thumb` INT NOT NULL AFTER `parent` ; | |||
(88 unchanged lines omitted) | ||||||
209 | # Record the last hit IP | 216 | # Record the last hit IP | |||
210 | # | 217 | # | |||
211 | 218 | |||||
212 | ALTER TABLE `CPG_pictures` ADD `lasthit_ip` TINYTEXT ; | 219 | ALTER TABLE `CPG_pictures` ADD `lasthit_ip` TINYTEXT ; |
Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.