From: drh Date: Fri, 16 Jan 2015 12:24:00 +0000 (+0000) Subject: Merge the 3.8.8 release changes from trunk. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b2856ca5c1e820997413544223a67fcf72fcff;p=thirdparty%2Fsqlite.git Merge the 3.8.8 release changes from trunk. FossilOrigin-Name: 518621f8dcd6c0cc107110991753731a19b263f6 --- a3b2856ca5c1e820997413544223a67fcf72fcff diff --cc manifest index 9c2e8fd09c,2d35ff8ff1..3e887f98cf --- a/manifest +++ b/manifest @@@ -1,10 -1,10 +1,10 @@@ - C Merge\sthe\stesting\senhancements\sand\sthe\sunlimited\sVALUES\senhancement\sfrom\strunk. - D 2015-01-08T19:55:13.561 -C Version\s3.8.8 -D 2015-01-16T12:08:06.393 ++C Merge\sthe\s3.8.8\srelease\schanges\sfrom\strunk. ++D 2015-01-16T12:24:00.930 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 549f625e1b0b2e63c026e707aefc1b7916d732b4 -F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610 ++F Makefile.in 85c98e5c9a3a8f1e9cf4d962b813aeda1300512b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09 - F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0 + F Makefile.msc 4c057774e6138b9023fc16ec05639ddd3329b152 + F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866 F VERSION d846487aff892625eb8e75960234e7285f0462fe F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -26,7 -26,7 +26,7 @@@ F autoconf/missing d7c9981a81af13370d4e F autoconf/tea/Makefile.in d55bcc63832caf0309c2ff80358756116618cfca F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 - F autoconf/tea/configure.in 93d43c79e936fb16556e22498177d7e8571efa04 -F autoconf/tea/configure.ac 93d43c79e936fb16556e22498177d7e8571efa04 ++F autoconf/tea/configure.ac 93d43c79e936fb16556e22498177d7e8571efa04 w autoconf/tea/configure.in F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523 F autoconf/tea/pkgIndex.tcl.in 3ef61715cf1c7bdcff56947ffadb26bc991ca39d @@@ -124,7 -124,7 +124,7 @@@ F ext/misc/vfslog.c fe40fab5c077a40477f F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 - F ext/rtree/rtree.c 072d7c54c438246b85ad308cbee59eaf1d2b782e -F ext/rtree/rtree.c 14e6239434d4e3f65d3e90320713f26aa24e167f ++F ext/rtree/rtree.c dd251a63b84ec8c368c335ee0ac2abb7ecf058fd F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba @@@ -155,7 -152,7 +155,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 29f7eb2f663c0bc93b36afe30a05ea0b19078eaa -F main.mk e392561ffe17fc4dad945eef852400d5bf2911a0 ++F main.mk 578612bd44492393c432ed3161b7a5aeced3d1ee F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -182,26 -179,26 +182,26 @@@ F src/btreeInt.h a3d0ae1d511365e1a2b76a F src/build.c f5cfd7b32216f695b995bbc7c1a395f6d451d11f F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463 - F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a - F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744 - F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417 - F src/expr.c 00da3072f362b06f39ce4052baa1d4ce2bb36d1c + F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887 + F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac + F src/delete.c bd1a91ddd247ce13004075251e0b7fe2bf9925ef + F src/expr.c 7be80f7dc337329a24df45c2f3bdb2ea3b64c90e F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12 -F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430 +F src/func.c e331a645ae437de0089d9789f678073a114c804d F src/global.c 12561d70a1b25f67b21154622bb1723426724f75 F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5 F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660 - F src/main.c cee396009c8ae26aac298de36e1ff28c8bb98fb1 -F src/main.c 05bf368c934cc73d02906030846eb4d1818c10f7 ++F src/main.c b5d472b9b1354f0eb027f6e0ff0a698f7bf70510 F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 - F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f + F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534 F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb @@@ -216,34 -214,33 +217,34 @@@ F src/os.c 5822c2b843a77219bba1e28887cd F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa - F src/os_unix.c 56858043a9603c7d724d77c992afa8e64c2f0a0d -F src/os_unix.c aefeaf915aaef9f81aa2645e0d5d06fa1bd83beb -F src/os_win.c 91d3d08e33ec0258d180d4c8255492f47d15e007 ++F src/os_unix.c 06e10d7aaf6b06947d9da35b38ff05000bf5058f +F src/os_win.c 659d2ea531c671e5322d896f61011253786e8e70 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696 F src/parse.y c5d0d964f9ac023e8154cad512e54b0b6058e086 - F src/pcache.c b83d160ce81ca101f98f0d27498e6d6bd49f1599 + F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8 F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf - F src/pragma.c 1f13dbb5522fe763fbe64b58a844787917648e7b -F src/pragma.c ba149bbbc90783f84815636c509ced8eac11bbcf -F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9 ++F src/pragma.c d9bd64b0ca977e08a1cd2d19743a91fafa01f205 +F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167 - F src/printf.c 9e75a6a0b55bf61cfff7d7e19d89834a1b938236 + F src/printf.c ea82bcb1b83273b4c67177c233c1f78c81fc42f9 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e -F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df +F src/select.c eb792a4eb88e316a8450d7e11d154fe945889371 - F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf - F src/sqlite.h.in fd69431f2facc8cfadf1c9eb9b365c4c028dbae6 + F src/shell.c 5b8e786a7c8eec87fa3f2ea615b337d2d99e284c -F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada ++F src/sqlite.h.in c5c116e853f01b0d16a128d4f63a80f4fb0ede3f F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d - F src/sqliteInt.h 8f8bc296bbe093567ff368b473b64452a6957b18 -F src/sqliteInt.h eaf210295b551d4e40e622aec1b2261c0b28f844 ++F src/sqliteInt.h b20f54ab2456f39ceb420f518314101f110d4973 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 81712116e826b0089bb221b018929536b2b5406f F src/table.c e7a09215315a978057fb42c640f890160dbcc45e - F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622 - F src/test1.c da07829e5fb676d2b738931d70ecfcc8818c0f61 - F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712 + F src/tclsqlite.c 0bbb44543175ef2033d39780a233f98bf354eff9 -F src/test1.c 093d8b5b54b829dcfebae3181d4406edcc935d90 ++F src/test1.c aefeee7e7663454cf6197061df4837ead844d15b + F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1 @@@ -253,10 -250,10 +254,10 @@@ F src/test8.c df8dd4c99c1dd2225cb2a6f33 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60 F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8 F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12 -F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e +F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803 F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09 F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f - F src/test_config.c 2cb46d68a20f26d89899b64069a1cff9fb6f7e36 -F src/test_config.c e7b2e1634324d746aa5e1c7e0929470e8be27953 ++F src/test_config.c 90441a025b77cf7831dab8ed94b3692115ed965a F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -274,9 -271,9 +275,9 @@@ F src/test_mutex.c 293042d623ebba969160 F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25 F src/test_osinst.c 3d0340bc31a9f3d8a3547e0272373e80f78dde25 F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00 - F src/test_quota.c 65f6348fec0f2b3020c907247fb47556b214abb9 + F src/test_quota.c 180813f43683be5725458fc1ff13ac455d8e722d F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d -F src/test_rtree.c fdd8d29ca5165c7857987a2ba263fac5c69e231f +F src/test_rtree.c bfe6f4386517f70054311109f3528adffec34485 F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091 F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe F src/test_sqllog.c c1c1bbedbcaf82b93d83e4f9dd990e62476a680e @@@ -293,20 -290,20 +294,20 @@@ F src/tokenize.c e00458c9938072b0ea711c F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c - F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73 + F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c - F src/vdbe.c 9f43973c08d115f5fbe46fe30663e536018d7b43 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a ++F src/vdbe.c 0fa93ce5135f2083abcb28e854be3b4b49477eac F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3 F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71 -F src/vdbeaux.c 07ef87c6d4b5abdf13ff33babb10205702fdab0a +F src/vdbeapi.c ad6b1bde19d27ec5b278af4a8182ff60fdae5bc3 +F src/vdbeaux.c 65d2516652fa8d171085a2ae4a04f76545c633c1 F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778 F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f - F src/vdbesort.c 560bdfd9eb3ae3205196e0d64ccd1de925caa6c7 + F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010 F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9 -F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 +F src/wal.c 895b26c4c5fe9139f676d9bd64cf7e72563b6705 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804 F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1 F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0 @@@ -784,11 -780,11 +785,11 @@@ F test/pagerfault2.test caf4c7facb914fd F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8 F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6 F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0 -F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d +F test/pcache.test 488061b5dd685df2234d690370285c9b4813377b F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff - F test/permutations.test fa2b4e56d1427dd3763053d78ce2f132376bb695 + F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1 -F test/pragma.test aa16dedfe01c02c8895169012f7dfde9c163f0d5 +F test/pragma.test 7d7823c30925e6c18da6bf7bb4436b762188527f F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552 @@@ -863,10 -859,10 +864,10 @@@ F test/shell1.test cdeb849acc2c37aada70 F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862 F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29 F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5 - F test/shell5.test 15a419cc1df21c892ed64f5596ae7a501f2816f2 + F test/shell5.test 81aba4793fa7441b1300daae1aec4f7e4b5741c1 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 -F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868 +F test/shrink.test 41ab166b276af4812bcaf6f1b99c53fab4e706d0 F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329 F test/skipscan1.test 2ddfe5d168462170c4487f534e2a99fb006b2076 F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a @@@ -1206,10 -1202,10 +1207,10 @@@ F tool/mkkeywordhash.c dfff09dbbfaf950e F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkpragmatab.tcl 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 - F tool/mksqlite3c-noext.tcl 88a1e3b0c769773fb7a9ebb363ffc603a4ac21d8 - F tool/mksqlite3c.tcl 4280f9d22fe60d2fcc4076354c464701f2994cc7 + F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5 -F tool/mksqlite3c.tcl cfde806851c413db7689b9cb74a4eeb92539c601 ++F tool/mksqlite3c.tcl 87e1e7a67acf3608633f0acb12a860c342628e44 F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 - F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1 + F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97 @@@ -1240,7 -1236,10 +1241,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P df3cdf9f0690f2724c7e4e0adb2e3bd4b1a4dd26 50b5a8af843fff93452cd1c8f82152124a1d864a - R 6a22cf025bcb83d27f721f2fa6249f59 -P 8f45217cbafef2297cdcec3fd69f4371dfb83922 -R 933466cd8ec4e35d692da3aefe1a6703 -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.8.8 * ++P cc7808427f8e9df8e2810a6681b2ddd93e578c67 7d68a42face3ab14ed88407d4331872f5b243fdf ++R 736a6a29fb38bc726ce5f27cd8e8ec8c U drh - Z 4eed5f9ecc66c188c6b2f3aad302150d -Z bb546801ed90d1803572e32e58b772a4 ++Z aa9817599eedc2800d3e870eb012e1f7 diff --cc manifest.uuid index 88aec4945d,b043ddc196..aeea87755c --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - cc7808427f8e9df8e2810a6681b2ddd93e578c67 -7d68a42face3ab14ed88407d4331872f5b243fdf ++518621f8dcd6c0cc107110991753731a19b263f6