From: drh Date: Tue, 9 Oct 2012 14:58:15 +0000 (+0000) Subject: Merge the latest trunk changes, especially the ORDER BY optimizer enhancements X-Git-Tag: version-3.13.0~148^2~225 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1102b1ec7d50045cbbcf2575eacb2d423361fc7;p=thirdparty%2Fsqlite.git Merge the latest trunk changes, especially the ORDER BY optimizer enhancements but also other fixes, onto the sessions branch. FossilOrigin-Name: f1fbb8c5bfa84e84e0b8e2872d83b06a0c0d5acc --- d1102b1ec7d50045cbbcf2575eacb2d423361fc7 diff --cc manifest index 46c1815db6,820f87d17f..72157a1697 --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Merge\sthe\slatest\strunk\schanges\s(especially\s"PRAGMA\sbusy_timeout"\sand\sthe\nORDER\sBY\squery\splanner\soptimizations)\sinto\sthe\ssessions\sbranch. - D 2012-09-28T13:05:48.372 -C Avoid\san\sassertion\sfault\sand/or\sfreeing\smemory\swhile\sit\sis\sstill\sin\suse\swhen\nan\serror\soccurs\sduring\svirtual\stable\sconstruction. -D 2012-10-09T14:36:47.262 ++C Merge\sthe\slatest\strunk\schanges,\sespecially\sthe\sORDER\sBY\soptimizer\senhancements\nbut\salso\sother\sfixes,\sonto\sthe\ssessions\sbranch. ++D 2012-10-09T14:58:15.175 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc 321efe6f572a1d4f8e27794c4575dd9b51d3e731 -F Makefile.msc a8495ef567c1872cd9e0679c96a02aafbf9c43b5 ++F Makefile.msc a26021086defb54e6cb61439a90be5960b713017 F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d @@@ -141,8 -129,8 +141,8 @@@ F src/callback.c d7e46f40c3cf53c43550b7 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4 - F src/delete.c c856ca31177a5cc1612b47ca0c628cd227aa072e - F src/expr.c 4de967b85f577ba00a7cdcb53d22070def6198db -F src/delete.c e35684ad93c741266b086610d2efd709b7946853 ++F src/delete.c e44a1b66cd3dc1e9e2c74147ee4991214e6e6978 + F src/expr.c 57fb8e7a05d4147e40b9f4c439e37ed2abab9332 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af F src/func.c cbb90dc84b22eea25caf39528d342279e61b8898 @@@ -150,12 -138,12 +150,12 @@@ F src/global.c fb44b11e02e06c995e6ed664 F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 - F src/insert.c 08ec5cec28c692fc27a23659875cc167f5c6ece7 -F src/insert.c ad0d8943d2a4f0b52ebf75b9e459f2da00117dbd ++F src/insert.c 6273647b67e27e3f81b7d1fd144307ea726841d0 F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416 F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d - F src/main.c febaf66b42c36433b170e4704fef5b8b073a6d61 -F src/main.c ca6784455f3207524b82d24141676d641d44f137 ++F src/main.c 5cee8048dde78b2b47f5c2090cbb31b10d190673 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa @@@ -186,17 -174,17 +186,17 @@@ F src/printf.c 4a9f882f1c1787a8b494a298 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 - F src/select.c 75c5e37cc882c468383c9d9e07496b9a16cfae3e + F src/select.c 2a82736faeca1fe93315eda20c691d68ec13bb6c F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7 - F src/sqlite.h.in 2f2822ac789d820e05afb19831e62fd83e69c60b -F src/sqlite.h.in c7be05ad191d2634292fcc77bdb2bcfa4526eb98 ++F src/sqlite.h.in d460ae07ecdd1c820272d9c217547c7b572cb4b7 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477 - F src/sqliteInt.h 34844b666512c2c5656c5d470f165ed1db0fcd48 -F src/sqliteInt.h 1c5c35cc835e4c4e26be43e663661a237db74c59 ++F src/sqliteInt.h fec16c0932b30aedf5d3b577aaf5f881589c8dd0 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e - F src/tclsqlite.c 79ac64bdd8555b8967032e1e69051d88366f9b77 - F src/test1.c 0354b555639c92d2a63c0ad4e74ed152ba47e604 -F src/tclsqlite.c 515abd8e33e82aa330eeb54675185a7e1e5b6778 ++F src/tclsqlite.c 289be7b639406314813219ee7bc043d21f36ab12 + F src/test1.c 936afc02766403e5debca49a1817a780e116df7e F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa @@@ -248,12 -236,12 +248,12 @@@ F src/update.c abb0fcabe551dae0a133fd2a F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455 F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd -F src/vdbe.c 31523df2b986fc6c959dd54ca640ba865884641b -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb -F src/vdbeInt.h 573a43ab5697b648a1e8f3dfc7d8667d5ca55729 -F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c -F src/vdbeaux.c 674e969e026d1af1938942eba17071127839fc15 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb +F src/vdbe.c e8e2e34c23a474c38f494d572a0d8accaabd0b4a +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f +F src/vdbeInt.h 39acf85fa83f98e27e728722a0f53daf7d174b61 +F src/vdbeapi.c 58fdcd56109c05876f69c25d47a138ef370d3647 - F src/vdbeaux.c 857c8372d3b06d66e37428712265f9033932f3ec ++F src/vdbeaux.c 1005a2ea2cbbe5d2841367eebae67ce848a6247a +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74 F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835 @@@ -524,9 -512,9 +524,9 @@@ F test/fuzz2.test 207d0f9d06db3eaf47a6b F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26 - F test/fuzzer1.test 69cf1036b92fd3b8e1fd65bef4d7ee3f085c28fb + F test/fuzzer1.test a2e93bb1e19513dd6bf9c63d3d7c4673c983ca19 F test/fuzzerfault.test ff2282c81797b6a355f0748d8b54c7287c5d2b25 -F test/hook.test 5f3749de6462a6b87b4209b74adf7df5ac2df639 +F test/hook.test 94b927b15883f5c1477ab09eecd16275addb08f4 F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4 F test/in.test 5941096407d8c133b9eff15bd3e666624b6cbde3 F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75 @@@ -749,7 -738,7 +751,7 @@@ F test/syscall.test bea9bf329bff733c791 F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126 - F test/tclsqlite.test 02b2c268d38203987dd1839598ac524f7612ec3c -F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43 ++F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d @@@ -1030,7 -1019,7 +1032,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 - P fae9eb197fcef726fd2c7c701afe6805fc008cf9 1e874629d7cf568368b912b295bd3001147d0b52 - R 3dd4bfa3bb20bc9f3b355292d5659141 -P bb5c0f1c92b48631d4a12cd4f321b53cd07885c8 -R a8d4530b0140a5399b6136d03ddec9af ++P 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d a02599ad85d02470c9effa51c02dbda7796bfa16 ++R 05272e22ec105aad09507c576198ab3e U drh - Z d6a15b3f33482cbc762a2fcdf6bf0623 -Z a4f133ff7d13d53e026b03f59090cbe2 ++Z 8b270f262a5da1e0ba6e8c7b897dd596 diff --cc manifest.uuid index 8adce7bd3f,a002cb666a..f368e5856b --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d -a02599ad85d02470c9effa51c02dbda7796bfa16 ++f1fbb8c5bfa84e84e0b8e2872d83b06a0c0d5acc