Fossil SCM

Update to SQLite 3.8.4.2. No need for "win32-longpath" any more for Cygwin.

jan.nijtmans 2014-03-28 07:12 branch-1.28
Commit 2ae080c1a337f5fc1be4e3a589de0d7db6b52b94
Parent 0e40f659ab0236c…
7 files changed +4 -2 -5 -5 +4 -3 +2 -2 +3 -2 +3 -2
~ Makefile.Cygwin.in ~ src/main.c ~ src/main.c ~ src/sqlite3.c ~ src/sqlite3.h ~ www/changes.wiki ~ www/changes.wiki
M Makefile.Cygwin.in
+4 -2
--- Makefile.Cygwin.in
+++ Makefile.Cygwin.in
@@ -36,17 +36,19 @@
3636
 # care about testing the end result, this can be blank.
3737
 #
3838
 TCLSH = tclsh
3939
4040
 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
41
-TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
41
+TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -DFOSSIL_OMIT_LOAD_AVERAGE
4242
 INSTALLDIR =$(DESTDIR)@prefix@/bin
4343
 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
4444
 FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
4545
 FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
4646
 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
47
-SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096
47
+SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI
48
+SQLITE_CFLAGS += -DSQLITE_WIN32_MAX_PATH_BYTES=4096
49
+SQLITE_CFLAGS += -DSQLITE_MAX_MMAP_SIZE=0x7fff0000
4850
4951
 include $(SRCDIR)/main.mk
5052
5153
 distclean: clean
5254
 rm -f autoconfig.h config.log Makefile
5355
--- Makefile.Cygwin.in
+++ Makefile.Cygwin.in
@@ -36,17 +36,19 @@
36 # care about testing the end result, this can be blank.
37 #
38 TCLSH = tclsh
39
40 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
41 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
42 INSTALLDIR =$(DESTDIR)@prefix@/bin
43 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
44 FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
45 FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
46 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
47 SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096
 
 
48
49 include $(SRCDIR)/main.mk
50
51 distclean: clean
52 rm -f autoconfig.h config.log Makefile
53
--- Makefile.Cygwin.in
+++ Makefile.Cygwin.in
@@ -36,17 +36,19 @@
36 # care about testing the end result, this can be blank.
37 #
38 TCLSH = tclsh
39
40 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
41 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -DFOSSIL_OMIT_LOAD_AVERAGE
42 INSTALLDIR =$(DESTDIR)@prefix@/bin
43 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
44 FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
45 FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
46 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
47 SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI
48 SQLITE_CFLAGS += -DSQLITE_WIN32_MAX_PATH_BYTES=4096
49 SQLITE_CFLAGS += -DSQLITE_MAX_MMAP_SIZE=0x7fff0000
50
51 include $(SRCDIR)/main.mk
52
53 distclean: clean
54 rm -f autoconfig.h config.log Makefile
55
M src/main.c
-5
--- src/main.c
+++ src/main.c
@@ -600,15 +600,10 @@
600600
 #endif
601601
 g.mainTimerId = fossil_timer_start();
602602
 g.zVfsName = find_option("vfs",0,1);
603603
 if( g.zVfsName==0 ){
604604
 g.zVfsName = fossil_getenv("FOSSIL_VFS");
605
-#if defined(__CYGWIN__)
606
- if( g.zVfsName==0 && sqlite3_libversion_number()>=3008001 ){
607
- g.zVfsName = "win32-longpath";
608
- }
609
-#endif
610605
 }
611606
 if( g.zVfsName ){
612607
 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
613608
 if( pVfs ){
614609
 sqlite3_vfs_register(pVfs, 1);
615610
--- src/main.c
+++ src/main.c
@@ -600,15 +600,10 @@
600 #endif
601 g.mainTimerId = fossil_timer_start();
602 g.zVfsName = find_option("vfs",0,1);
603 if( g.zVfsName==0 ){
604 g.zVfsName = fossil_getenv("FOSSIL_VFS");
605 #if defined(__CYGWIN__)
606 if( g.zVfsName==0 && sqlite3_libversion_number()>=3008001 ){
607 g.zVfsName = "win32-longpath";
608 }
609 #endif
610 }
611 if( g.zVfsName ){
612 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
613 if( pVfs ){
614 sqlite3_vfs_register(pVfs, 1);
615
--- src/main.c
+++ src/main.c
@@ -600,15 +600,10 @@
600 #endif
601 g.mainTimerId = fossil_timer_start();
602 g.zVfsName = find_option("vfs",0,1);
603 if( g.zVfsName==0 ){
604 g.zVfsName = fossil_getenv("FOSSIL_VFS");
 
 
 
 
 
605 }
606 if( g.zVfsName ){
607 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
608 if( pVfs ){
609 sqlite3_vfs_register(pVfs, 1);
610
M src/main.c
-5
--- src/main.c
+++ src/main.c
@@ -600,15 +600,10 @@
600600
 #endif
601601
 g.mainTimerId = fossil_timer_start();
602602
 g.zVfsName = find_option("vfs",0,1);
603603
 if( g.zVfsName==0 ){
604604
 g.zVfsName = fossil_getenv("FOSSIL_VFS");
605
-#if defined(__CYGWIN__)
606
- if( g.zVfsName==0 && sqlite3_libversion_number()>=3008001 ){
607
- g.zVfsName = "win32-longpath";
608
- }
609
-#endif
610605
 }
611606
 if( g.zVfsName ){
612607
 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
613608
 if( pVfs ){
614609
 sqlite3_vfs_register(pVfs, 1);
615610
--- src/main.c
+++ src/main.c
@@ -600,15 +600,10 @@
600 #endif
601 g.mainTimerId = fossil_timer_start();
602 g.zVfsName = find_option("vfs",0,1);
603 if( g.zVfsName==0 ){
604 g.zVfsName = fossil_getenv("FOSSIL_VFS");
605 #if defined(__CYGWIN__)
606 if( g.zVfsName==0 && sqlite3_libversion_number()>=3008001 ){
607 g.zVfsName = "win32-longpath";
608 }
609 #endif
610 }
611 if( g.zVfsName ){
612 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
613 if( pVfs ){
614 sqlite3_vfs_register(pVfs, 1);
615
--- src/main.c
+++ src/main.c
@@ -600,15 +600,10 @@
600 #endif
601 g.mainTimerId = fossil_timer_start();
602 g.zVfsName = find_option("vfs",0,1);
603 if( g.zVfsName==0 ){
604 g.zVfsName = fossil_getenv("FOSSIL_VFS");
 
 
 
 
 
605 }
606 if( g.zVfsName ){
607 sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
608 if( pVfs ){
609 sqlite3_vfs_register(pVfs, 1);
610
M src/sqlite3.c
+4 -3
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
11
 /******************************************************************************
22
 ** This file is an amalgamation of many separate C source files from SQLite
3
-** version 3.8.4.1. By combining all the individual C code files into this
3
+** version 3.8.4.2. By combining all the individual C code files into this
44
 ** single large file, the entire code can be compiled as a single translation
55
 ** unit. This allows many compilers to do optimizations that would not be
66
 ** possible if the files were compiled separately. Performance improvements
77
 ** of 5% or more are commonly seen when SQLite is compiled as a single
88
 ** translation unit.
@@ -220,13 +220,13 @@
220220
 **
221221
 ** See also: [sqlite3_libversion()],
222222
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
223223
 ** [sqlite_version()] and [sqlite_source_id()].
224224
 */
225
-#define SQLITE_VERSION "3.8.4.1"
225
+#define SQLITE_VERSION "3.8.4.2"
226226
 #define SQLITE_VERSION_NUMBER 3008004
227
-#define SQLITE_SOURCE_ID "2014-03-11 15:27:36 018d317b1257ce68a92908b05c9c7cf1494050d0"
227
+#define SQLITE_SOURCE_ID "2014-03-26 18:51:19 02ea166372bdb2ef9d8dfbb05e78a97609673a8e"
228228
229229
 /*
230230
 ** CAPI3REF: Run-Time Library Version Numbers
231231
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
232232
 **
@@ -64780,10 +64780,11 @@
6478064780
 i = 1;
6478164781
 pRhs++;
6478264782
 }else{
6478364783
 idx1 = getVarint32(aKey1, szHdr1);
6478464784
 d1 = szHdr1;
64785
+ if( d1>(unsigned)nKey1 ) return 1; /* Corruption */
6478564786
 i = 0;
6478664787
 }
6478764788
6478864789
 VVA_ONLY( mem1.zMalloc = 0; ) /* Only needed by assert() statements */
6478964790
 assert( pPKey2->pKeyInfo->nField+pPKey2->pKeyInfo->nXField>=pPKey2->nField
6479064791
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
1 /******************************************************************************
2 ** This file is an amalgamation of many separate C source files from SQLite
3 ** version 3.8.4.1. By combining all the individual C code files into this
4 ** single large file, the entire code can be compiled as a single translation
5 ** unit. This allows many compilers to do optimizations that would not be
6 ** possible if the files were compiled separately. Performance improvements
7 ** of 5% or more are commonly seen when SQLite is compiled as a single
8 ** translation unit.
@@ -220,13 +220,13 @@
220 **
221 ** See also: [sqlite3_libversion()],
222 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
223 ** [sqlite_version()] and [sqlite_source_id()].
224 */
225 #define SQLITE_VERSION "3.8.4.1"
226 #define SQLITE_VERSION_NUMBER 3008004
227 #define SQLITE_SOURCE_ID "2014-03-11 15:27:36 018d317b1257ce68a92908b05c9c7cf1494050d0"
228
229 /*
230 ** CAPI3REF: Run-Time Library Version Numbers
231 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
232 **
@@ -64780,10 +64780,11 @@
64780 i = 1;
64781 pRhs++;
64782 }else{
64783 idx1 = getVarint32(aKey1, szHdr1);
64784 d1 = szHdr1;
 
64785 i = 0;
64786 }
64787
64788 VVA_ONLY( mem1.zMalloc = 0; ) /* Only needed by assert() statements */
64789 assert( pPKey2->pKeyInfo->nField+pPKey2->pKeyInfo->nXField>=pPKey2->nField
64790
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1,8 +1,8 @@
1 /******************************************************************************
2 ** This file is an amalgamation of many separate C source files from SQLite
3 ** version 3.8.4.2. By combining all the individual C code files into this
4 ** single large file, the entire code can be compiled as a single translation
5 ** unit. This allows many compilers to do optimizations that would not be
6 ** possible if the files were compiled separately. Performance improvements
7 ** of 5% or more are commonly seen when SQLite is compiled as a single
8 ** translation unit.
@@ -220,13 +220,13 @@
220 **
221 ** See also: [sqlite3_libversion()],
222 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
223 ** [sqlite_version()] and [sqlite_source_id()].
224 */
225 #define SQLITE_VERSION "3.8.4.2"
226 #define SQLITE_VERSION_NUMBER 3008004
227 #define SQLITE_SOURCE_ID "2014-03-26 18:51:19 02ea166372bdb2ef9d8dfbb05e78a97609673a8e"
228
229 /*
230 ** CAPI3REF: Run-Time Library Version Numbers
231 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
232 **
@@ -64780,10 +64780,11 @@
64780 i = 1;
64781 pRhs++;
64782 }else{
64783 idx1 = getVarint32(aKey1, szHdr1);
64784 d1 = szHdr1;
64785 if( d1>(unsigned)nKey1 ) return 1; /* Corruption */
64786 i = 0;
64787 }
64788
64789 VVA_ONLY( mem1.zMalloc = 0; ) /* Only needed by assert() statements */
64790 assert( pPKey2->pKeyInfo->nField+pPKey2->pKeyInfo->nXField>=pPKey2->nField
64791
M src/sqlite3.h
+2 -2
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -105,13 +105,13 @@
105105
 **
106106
 ** See also: [sqlite3_libversion()],
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110
-#define SQLITE_VERSION "3.8.4.1"
110
+#define SQLITE_VERSION "3.8.4.2"
111111
 #define SQLITE_VERSION_NUMBER 3008004
112
-#define SQLITE_SOURCE_ID "2014-03-11 15:27:36 018d317b1257ce68a92908b05c9c7cf1494050d0"
112
+#define SQLITE_SOURCE_ID "2014-03-26 18:51:19 02ea166372bdb2ef9d8dfbb05e78a97609673a8e"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -105,13 +105,13 @@
105 **
106 ** See also: [sqlite3_libversion()],
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.4.1"
111 #define SQLITE_VERSION_NUMBER 3008004
112 #define SQLITE_SOURCE_ID "2014-03-11 15:27:36 018d317b1257ce68a92908b05c9c7cf1494050d0"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -105,13 +105,13 @@
105 **
106 ** See also: [sqlite3_libversion()],
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.4.2"
111 #define SQLITE_VERSION_NUMBER 3008004
112 #define SQLITE_SOURCE_ID "2014-03-26 18:51:19 02ea166372bdb2ef9d8dfbb05e78a97609673a8e"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
M www/changes.wiki
+3 -2
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,13 +1,14 @@
11
 <title>Change Log</title>
22
33
 <h2>Changes For Version 1.28.1 (most likely never being released, those
44
 are candidate cherry-picks just in case)</h2>
5
- * Upgraded internal SQLite to version 3.8.4.1, which adds support for
5
+ * Upgraded internal SQLite to version 3.8.4.2, which adds support for
66
 CTE and the WITH clause, and fixes various (minor) SQLite bugs.
77
 * Relax minimum SQLite version check to 3.7.17, as Fossil 1.28
8
- actually works fine with "configure --disable-internal-sqlite"
8
+ actually works fine with this version and higher, when configured
9
+ with --disable-internal-sqlite.
910
 See: [https://www.mail-archive.com/[email protected]/msg14520.html]
1011
 * [252aff3e62]: Make "fossil diff --tk" work out-of-the-box on Windows
1112
 when Activestate Tcl is installed.
1213
 * [d5d7e640d0]: After successful "login" return to web-page immediately
1314
 before logging in.
1415
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,13 +1,14 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.28.1 (most likely never being released, those
4 are candidate cherry-picks just in case)</h2>
5 * Upgraded internal SQLite to version 3.8.4.1, which adds support for
6 CTE and the WITH clause, and fixes various (minor) SQLite bugs.
7 * Relax minimum SQLite version check to 3.7.17, as Fossil 1.28
8 actually works fine with "configure --disable-internal-sqlite"
 
9 See: [https://www.mail-archive.com/[email protected]/msg14520.html]
10 * [252aff3e62]: Make "fossil diff --tk" work out-of-the-box on Windows
11 when Activestate Tcl is installed.
12 * [d5d7e640d0]: After successful "login" return to web-page immediately
13 before logging in.
14
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,13 +1,14 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.28.1 (most likely never being released, those
4 are candidate cherry-picks just in case)</h2>
5 * Upgraded internal SQLite to version 3.8.4.2, which adds support for
6 CTE and the WITH clause, and fixes various (minor) SQLite bugs.
7 * Relax minimum SQLite version check to 3.7.17, as Fossil 1.28
8 actually works fine with this version and higher, when configured
9 with --disable-internal-sqlite.
10 See: [https://www.mail-archive.com/[email protected]/msg14520.html]
11 * [252aff3e62]: Make "fossil diff --tk" work out-of-the-box on Windows
12 when Activestate Tcl is installed.
13 * [d5d7e640d0]: After successful "login" return to web-page immediately
14 before logging in.
15
M www/changes.wiki
+3 -2
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,13 +1,14 @@
11
 <title>Change Log</title>
22
33
 <h2>Changes For Version 1.28.1 (most likely never being released, those
44
 are candidate cherry-picks just in case)</h2>
5
- * Upgraded internal SQLite to version 3.8.4.1, which adds support for
5
+ * Upgraded internal SQLite to version 3.8.4.2, which adds support for
66
 CTE and the WITH clause, and fixes various (minor) SQLite bugs.
77
 * Relax minimum SQLite version check to 3.7.17, as Fossil 1.28
8
- actually works fine with "configure --disable-internal-sqlite"
8
+ actually works fine with this version and higher, when configured
9
+ with --disable-internal-sqlite.
910
 See: [https://www.mail-archive.com/[email protected]/msg14520.html]
1011
 * [252aff3e62]: Make "fossil diff --tk" work out-of-the-box on Windows
1112
 when Activestate Tcl is installed.
1213
 * [d5d7e640d0]: After successful "login" return to web-page immediately
1314
 before logging in.
1415
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,13 +1,14 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.28.1 (most likely never being released, those
4 are candidate cherry-picks just in case)</h2>
5 * Upgraded internal SQLite to version 3.8.4.1, which adds support for
6 CTE and the WITH clause, and fixes various (minor) SQLite bugs.
7 * Relax minimum SQLite version check to 3.7.17, as Fossil 1.28
8 actually works fine with "configure --disable-internal-sqlite"
 
9 See: [https://www.mail-archive.com/[email protected]/msg14520.html]
10 * [252aff3e62]: Make "fossil diff --tk" work out-of-the-box on Windows
11 when Activestate Tcl is installed.
12 * [d5d7e640d0]: After successful "login" return to web-page immediately
13 before logging in.
14
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,13 +1,14 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.28.1 (most likely never being released, those
4 are candidate cherry-picks just in case)</h2>
5 * Upgraded internal SQLite to version 3.8.4.2, which adds support for
6 CTE and the WITH clause, and fixes various (minor) SQLite bugs.
7 * Relax minimum SQLite version check to 3.7.17, as Fossil 1.28
8 actually works fine with this version and higher, when configured
9 with --disable-internal-sqlite.
10 See: [https://www.mail-archive.com/[email protected]/msg14520.html]
11 * [252aff3e62]: Make "fossil diff --tk" work out-of-the-box on Windows
12 when Activestate Tcl is installed.
13 * [d5d7e640d0]: After successful "login" return to web-page immediately
14 before logging in.
15

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button