From: drh Date: Sat, 13 Feb 2016 17:35:48 +0000 (+0000) Subject: Merge changes from the 3.11.0 release candidate. X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d774536f527d8c7c61db94db0874a8178d8dade4;p=thirdparty%2Fsqlite.git Merge changes from the 3.11.0 release candidate. FossilOrigin-Name: d198a6db2e49d0205420f8ed08cfffd75ee93e1e --- d774536f527d8c7c61db94db0874a8178d8dade4 diff --cc Makefile.in index 1e2c5cf844,013cf442d1..478d8f2710 --- a/Makefile.in +++ b/Makefile.in @@@ -584,12 -572,13 +585,12 @@@ libsqlite3.la: $(LIBOBJ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ - -rpath "$(TCLLIBDIR)" \ - -version-info "8:6:8" \ - -avoid-version + -rpath "$(TCLLIBDIR)/sqlite3" \ + -version-info "8:6:8" - sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h + sqlite3$(TEXE): $(TOP)/src/shell.c sqlite3.c $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ - $(TOP)/src/shell.c libsqlite3.la \ + $(TOP)/src/shell.c sqlite3.c \ $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h diff --cc manifest index 7ae907a4fa,edbefc847e..4341aa7082 --- a/manifest +++ b/manifest @@@ -1,8 -1,8 +1,8 @@@ - C Merge\srecent\sfixes\sand\senhancements\sfrom\strunk. - D 2016-02-09T15:50:33.582 - F Makefile.in 435011bc2d0ac33408de21bce5338e76673cd8f0 -C Fix\sa\spotential\sbuffer\soverread\sprovoked\sby\sinvalid\sutf-8\sin\sfts5. -D 2016-02-12T18:48:09.224 -F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142 ++C Merge\schanges\sfrom\sthe\s3.11.0\srelease\scandidate. ++D 2016-02-13T17:35:48.571 ++F Makefile.in 6bc82e8fca16b46e6158b5614f16b68cc42cbe5d F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 - F Makefile.msc b0493f10caddb8adf992a4e6f1943141fc7c6816 + F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -275,7 -272,7 +275,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 574d6e597978ef0f04192ad77a7a98b4a9834e31 -F main.mk 791597b87204f6bd56cdf7b2ab2feeecd608c60d ++F main.mk 4a722ea79e8a7b42071de4dcd3cff7ba8f8713c9 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 @@@ -312,11 -309,11 +312,11 @@@ F src/global.c bd5a0af3f30b0c01be6db756 F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5 F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 - F src/insert.c 046199e085e69e05af7bef197d53c5b4b402b6fa + F src/insert.c 9ca97272e9f74ed0efddf3b4350ee12740cebbef F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d -F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902 +F src/legacy.c c6552d90c1422aeae86fe0191c6963946aa2fddf F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b -F src/main.c b67a45397b93b7ba8fbd6bfcb03423d245baed05 +F src/main.c fb6058f37c1c4a8a3ee1c34a46cff59e583766de F src/malloc.c 337e9808b5231855fe28857950f4f60ae42c417f F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b @@@ -331,15 -328,15 +331,15 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23 F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17 F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7 - F src/os.c 5822c2b843a77219bba1e28887cdc816b27ca29d -F src/os.c 205fa2bad945a0dc7cad48f9f95ea3e8dc5408ff ++F src/os.c 4c975b1720bee3c452fd0e727b0b3e00346fe6a2 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf - F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e + F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa -F src/os_unix.c 821ed110197175165cf2f50b0930c7ff9a24504c -F src/os_win.c ccf29ddded3e41e506b6bd98c1171aa0963b23f2 +F src/os_unix.c 20b22469512e061c015ae2cb171a0950658d5ace +F src/os_win.c dc10ba379eaff9a1b37b4a47671929733971a71e F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca -F src/pager.c 67cd2fbab58d0e35fed5f81432856f4f0af9fc6d -F src/pager.h f3eb324a3ff2408b28bab7e81c1c55c13720f865 +F src/pager.c 184997e965838f7af174ef2a4b102d223ea9eff2 +F src/pager.h 3de08f90567892585cce2e1db07686ff1422c4fb F src/parse.y d7bff41d460f2df96fb890f36700e85cb0fc5634 F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23 F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545 @@@ -352,12 -349,11 +352,12 @@@ F src/random.c ba2679f80ec82c4190062d75 F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e F src/select.c ff80004a9a6ece891a8d9327a88e7b6e2588ee6d - F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4 - F src/sqlite.h.in 780a7899e1ddd11839495d7cf6d5def6f549800c + F src/shell.c 0367440658104bf2ce8d8a9a5a713a4b11c9acbe -F src/sqlite.h.in f80c6ebd85588fc514bfedf3ecb00cec269cb410 ++F src/sqlite.h.in 2af4ebbb62b79c0d7ac68901e39981c6461f59c6 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d - F src/sqliteInt.h ab8b7a5e7d007e0d5ba254b9c304ba9d21da3ff7 -F src/sqliteInt.h 04ca5b3cdb3bcf87ba6300d5d36b51498f65f28c ++F src/sqliteInt.h d96632a59d850b9fc66fcbd17016a4e42bd4ccbc F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e @@@ -428,10 -424,10 +428,10 @@@ F src/vdbesort.c ef3c6d1f1a7d44cf67bb2b F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484 F src/vtab.c bef51b4f693d82b4b0184457faa8625654534091 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c +F src/wal.c 9bd7a20c656171200725462a37183e53c549afda +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291 F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354 - F src/where.c d89fd5cff448ab5c5ca492dd9793b35ffe31ab35 + F src/where.c 984084584c10c41e46c89ac027a5cca991bc37e6 F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a F src/wherecode.c 791a784bbf8749d560fdb0b990b607bc4f44a38d F src/whereexpr.c de117970b29471177a6901d60ad83a194671dc03 @@@ -1396,10 -1391,10 +1396,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37 F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84 +F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7 F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b - F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b + F tool/mkvsix.tcl fbeb0af7cffdf64e0fba6d65e2e5120dc14595f4 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97 F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b @@@ -1430,9 -1425,9 +1430,9 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 - F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b + F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 201fcbeef35d3d06d71ef5770fb72152840fcc2e ca72be8618e5d466d6f35819ca8bbd2b84269959 - R fd70a57c2a0d3952fc53cce53256cdc7 -P 130580207ab5cee762b2893808acef7c8afad027 -R f6628307ca7dcc5e74da260d3c3d6ac5 -U dan -Z 7972d84e46f7d6d6e270e54f6c76821e ++P f073401792c0a093d4324fc2636170f108656976 a049fbbde5da2e43d41aa8c2b41f9eb21507ac76 ++R 08b85784270df2d9bb8996cc6368e262 +U drh - Z 0c6e5d4af8d5d65dcbc7bc2a9e46ad9d ++Z ebb7df642eb97cd9be2be5a6b0ed0028 diff --cc manifest.uuid index 8c29dd7e22,10c0eea158..0d81608228 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - f073401792c0a093d4324fc2636170f108656976 -a049fbbde5da2e43d41aa8c2b41f9eb21507ac76 ++d198a6db2e49d0205420f8ed08cfffd75ee93e1e