From: dan Date: Thu, 23 Apr 2015 19:32:19 +0000 (+0000) Subject: Merge latest trunk changes into this branch. X-Git-Tag: version-3.8.11~252^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e11afed5620d285f0d4d9dcb67e36cae8b152ac2;p=thirdparty%2Fsqlite.git Merge latest trunk changes into this branch. FossilOrigin-Name: 1506e99eca19f72fb59b55ec9e2534505dfa7a6e --- e11afed5620d285f0d4d9dcb67e36cae8b152ac2 diff --cc manifest index f057e9b6d8,d1717e9040..e3fda9fd86 --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Fix\sa\sperformance\sproblem\sin\scalls\sto\ssqlite3ota_close()\smade\safter\sthe\sOTA\supdate\shas\sbeen\scompletely\sapplied\sand\scheckpointed. - D 2015-04-23T19:18:42.820 -C Fix\sa\sfaulty\sassert()\sin\sthe\s"AS"\salias\sresolution\slogic\sof\sthe\sparser. -D 2015-04-23T13:37:05.307 ++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch. ++D 2015-04-23T19:32:19.839 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 79b306896135a2305cfb7e6d88990fc4820fb917 -F Makefile.in faaf75b89840659d74501bea269c7e33414761c1 ++F Makefile.in 34ca00e764c293f3a75208b607b4083a90a1bccf F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e + F Makefile.msc 32d8fe89ac5c130f9f14293fb4a59b120895c943 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866 F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a @@@ -171,7 -152,7 +171,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 95e9c8295b3ce06c0cbe6977b2b3ed8407cfe217 -F main.mk 60aba7d38b9bd73e249693344dd8405aa24ac02a ++F main.mk e58fe4b049a08b1fa73567790495b70f686f6162 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -242,23 -223,23 +242,23 @@@ F src/parse.y c4e0387bc88c8e21e5ba653e2 F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4 F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8 F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9 - F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88 + F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7 F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f - F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9 + F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3 F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 - F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab + F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e - F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3 - F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa + F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5 + F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f +F src/sqlite.h.in 3be4d9a7d38ef83fadd4aadd7ef3c6039e165da7 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d - F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379 + F src/sqliteInt.h 8abcea1295138f10ef8f7ed38db5f1b573b93ece F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179 F src/table.c e7a09215315a978057fb42c640f890160dbcc45e - F src/tclsqlite.c 796b427293e8f0e2769d3956c23df66880fe5535 -F src/tclsqlite.c 14f1992dd6100bfeb1a3dec7e7f449e1c814b8ee ++F src/tclsqlite.c 9ac7a3ee50a14e7aa4cbd35a6fb5c7c1bbf89e16 F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585 F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622 @@@ -326,8 -307,8 +326,8 @@@ F src/vxworks.h c18586c8edc1bddbc15c004 F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804 - F src/where.c 7e5d9a5690e71c39bfc4afea9f351766299dbf2f -F src/where.c 32fe265e3dc74ef3b27deb9e6eb5fc3c71409612 -F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c ++F src/where.c 80998bcd8929d2d098ee8d68a81215d5a22ef127 +F src/whereInt.h 1fca2f8c649f0ee38fd52332659d0e7deb11d428 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7 @@@ -813,8 -794,8 +814,8 @@@ F test/pagesize.test 1dd51367e752e742f5 F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1 +F test/permutations.test 0e2dc2aab7b1043bd2b4404f51651c31da007e52 - F test/pragma.test e6605ce89c66db930aef561e43a22281a09ffc66 + F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2 F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc @@@ -832,8 -813,8 +833,8 @@@ F test/randexpr1.test eda062a97e60f9c38 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254 - F test/releasetest.tcl b290782d0697b4e83d671da192cd9a7f71e2f6c1 - F test/resolver01.test 33abf37ff8335e6bf98f2b45a0af3e06996ccd9a -F test/releasetest.tcl a37cd82092c8be438255d65804b5951d6e3ecdae ++F test/releasetest.tcl 1ed00e5e59cde1147868d458fb236f302ce64289 + F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14 F test/rollbackfault.test 6a004f71087cc399296cffbb5429ea6da655ae65 @@@ -1235,10 -1217,10 +1237,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37 F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e -F tool/mksqlite3c.tcl 52a3352f7aa15f1db851e45ac3a5e2173d6fe93c +F tool/mksqlite3c.tcl 9f664f73301ad91ab8ff8886f35152293c564b17 F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b - F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105 + F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c @@@ -1270,7 -1252,7 +1272,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 baee3556ea10d96f1623cf4dce112fa1a1070820 - R 3707e9567587057d1905ac3053e5ac43 -P 01c50cee37bfaddfecdda014728c35a1be1d991a -R b16870d1654f6de484a72bbc7fa9d1f0 -U drh -Z cee60c918913e56f32da2a16c41282ec ++P fa62093b2531424846ea500c4155170d1bc7110e b5e43602833249aa4b73337bf85b7f308450dab6 ++R c95117e2851354f4fbc699c1409b62e5 +U dan - Z 69c7c4a32a6fe3149d703bd1c7c578ac ++Z 4eaccde899eceec56aac43725e359315 diff --cc manifest.uuid index 9ae23b966c,77658405b1..039295de6c --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - fa62093b2531424846ea500c4155170d1bc7110e -b5e43602833249aa4b73337bf85b7f308450dab6 ++1506e99eca19f72fb59b55ec9e2534505dfa7a6e