From: drh Date: Wed, 6 Jan 2010 13:12:48 +0000 (+0000) Subject: Update the OS-X branch to include all trunk changes through version 3.6.22. X-Git-Tag: mountain-lion~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf4cad1e4c75c27763fcd7c2fad08f8dad93b59c;p=thirdparty%2Fsqlite.git Update the OS-X branch to include all trunk changes through version 3.6.22. FossilOrigin-Name: 541e2b488e4e40706e457c6d3b5647d53da02ce9 --- bf4cad1e4c75c27763fcd7c2fad08f8dad93b59c diff --cc manifest index 083c72e36f,959dc6ca24..99484859a5 --- a/manifest +++ b/manifest @@@ -1,10 -1,10 +1,10 @@@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 - C Fix\sthe\smain.mk\smakefile\sso\sthat\sthe\ssqlrr\sextension\sis\sbuilt\sinto\sthe\namalgamation\scorrectly. - D 2009-12-23T18:06:50 -C Fix\san\sissue\swith\slemon\sgenerating\sincorrect\sgrammars.\s\sThis\sissue\sdoes\nnot\seffect\sSQLite. -D 2010-01-06T13:07:31 ++C Update\sthe\sOS-X\sbranch\sto\sinclude\sall\strunk\schanges\sthrough\sversion\s3.6.22. ++D 2010-01-06T13:12:48 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 -F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 +F Makefile.in df768f5addf7b6da984aa279123d2671d716cf5c F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 @@@ -67,17 -67,17 +67,17 @@@ F ext/fts3/fts3_hash.c 3c8f6387a4a7f530 F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295 F ext/fts3/fts3_porter.c a651e287e02b49b565a6ccf9441959d434489156 - F ext/fts3/fts3_snippet.c 6c2eb6d872d66b2a9aa5663f2662e993f18a6496 + F ext/fts3/fts3_snippet.c 0e38f76c5992dd08d20fc81e1265763370f9ea4f F ext/fts3/fts3_tokenizer.c 1a49ee3d79cbf0b9386250370d9cbfe4bb89c8ff - F ext/fts3/fts3_tokenizer.h 7ff73caa3327589bf6550f60d93ebdd1f6a0fb5c + F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3 F ext/fts3/fts3_tokenizer1.c 11a604a53cff5e8c28882727bf794e5252e5227b - F ext/fts3/fts3_write.c 2847b13da9e00016b81ea4b80ff5a298e55bc32d + F ext/fts3/fts3_write.c ccb92226608350dc3698ff7befa078d6f7a44fcc F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100 F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33 - F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2 + F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/rtree.c 038d59b05783c2e6c927a7352bb118a76c31065a +F ext/rtree/rtree.c 823d089fea8148f19be1c2fb4ff6ccf3e8ec966c F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree1.test f72885ed80a329d6bd7991043016d74b51edf2c5 F ext/rtree/rtree2.test 7b665c44d25e51b3098068d983a39902b2e2d7a1 @@@ -117,29 -114,29 +117,29 @@@ F src/btmutex.c 96a12f50f7a17475155971a F src/btree.c efdef3953c49e28f8b8fa9cc0ac5754cc1a7489a F src/btree.h 7944a9dac59eb3e541aad45fd2747f1051e7c63d F src/btreeInt.h 54f4245decd0409ea52cf9aee422d3d761d7ac10 - F src/build.c 5a18b6846e99cb923008a8c888d3fd520f0bea52 + F src/build.c 6ab7f8d8fa5b0ac6bfdce359e85f580b7a9b2e86 F src/callback.c 908f3e0172c3d4058f4ca0acd42c637c52e9669f - F src/complete.c 417df1ef5ea798532bb6290b0cc4265fef82980a + F src/complete.c 4c8a742c4a4a6d9c835912648f5c8f032ea36c7b F src/date.c a79c0a8f219370b972e320741f995a3bef9df33f - F src/delete.c 8b8afb9cd7783d573eae55a3f4208bc0637a2bb8 - F src/expr.c 50385ed51f1cd7f1ab289629cd0f87d5b2fcca52 + F src/delete.c 610dc008e88a9599f905f5cbe9577ac9c36e0581 + F src/expr.c d695300ba8b7a42d6b27a52d0288b974c89bf698 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0 -F src/func.c 69906340991919b4933dd8630774ad069e4d582e +F src/func.c 7b3a20690be32067365272b25b503302f23b889b F src/global.c 75946a4a2ab41c6ae58f10ca0ed31b3449694b26 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 F src/insert.c f9c6098988675ac258b2f98ea5f7e370fc9990fa F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c -F src/legacy.c 9304428e71b1d622b764913e1432e69156814755 +F src/legacy.c 3c3f78cbe4ada0b17b208da1e2e2773d6a96f27d F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581 - F src/main.c f195bd6fc719bda15c0efb504ca9e250411730de -F src/main.c a0f6dfbdd79e01baf75ad62bdbfdeae9e560eb96 ++F src/main.c 90176cc9163ed825e86ff021210f0ecc37aeed89 F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 -F src/mem1.c 552f7e11486272f27948d2de9c012884d1f52908 +F src/mem1.c 34cb5c25e4d2c1dcbdce244745999babf8d8dc5c - F src/mem2.c 3f196f6fd3f4320035eb4acbe4530686da2f14b1 + F src/mem2.c 92b4f772b1ee7469e256f1c2eff0b51a0ba19460 F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3 F src/mem5.c 4837b795ebdecc0cfe1522cd0c8b2c5d84ea490d F src/memjournal.c 5bfc2f33c914946e2f77ed3f882aff14dfc9355d @@@ -154,25 -151,25 +154,25 @@@ F src/os.c 4500ff276e277730776fe9b6c6c5 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f - F src/os_unix.c afabe88b8a208bd80d283282ce4dc48b53dc080e -F src/os_unix.c b24510792108ffee0c8175c1d2fc644913b241d2 ++F src/os_unix.c b0f41dcee44f93886f8df7ce80649925f1d1d5c2 F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b - F src/pager.c a0ed14b86de9d012a962b83389ca01003b6acccb + F src/pager.c e5421d38470fe58faee71a5a66a778ada882394c F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e F src/pcache.c 3b079306376e0e04c0d3df40c0a4b750a1839310 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8 -F src/pragma.c 6936d7df5e04b9f996f8f320d15e65b6944b2caa -F src/prepare.c 170bd953058efe1c46b8ad9020d49cd6f40f0b45 +F src/pragma.c eda3d6d165966e443301f9715adcae6b425655c1 - F src/prepare.c 23edf67b059372086378685ddf8c91ea82d9114a ++F src/prepare.c 464288500ead0e53735e3bdcc1259e48fc5dbd51 F src/printf.c 644bc7d59df3dc56d6d8b9a510914bfc6b51bc69 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 - F src/resolve.c d052e5c44bab34f83b3c1741aaa07478d18b5dd5 + F src/resolve.c 69a45df25039eb58e321653914ad670ffe49d486 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 - F src/select.c 68c58dc49341472e4e5661a47a1a9e5f8a161340 - F src/shell.c f4948cb6d30665d755a6b5e0ec313d1094aab828 - F src/sqlite.h.in 40b3091292e5830b33c9e50d8c52805b13c1e923 + F src/select.c 0109b993c360d649857523abb72919e1794f9b45 + F src/shell.c b95c5fcfe458027f192914a47474652969a1ec0f -F src/sqlite.h.in d493cf5029de67fe7252324473d89140a007a6c4 ++F src/sqlite.h.in ab2e4b701d1f715a746c03f9f204ae0993ec0200 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 - F src/sqliteInt.h 93d5d01d9ea57b95ba709733dce830ec056deb84 + F src/sqliteInt.h d6c48b1a5cd6485151e1d1b071dbe0a85ceb70fe F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6 F src/status.c e651be6b30d397d86384c6867bc016e4913bcac7 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@@ -214,12 -211,12 +214,12 @@@ F src/trigger.c d46f9389e3bf3dd1cc1d288 F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208 F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052 F src/util.c ad4f03079ba0fe83590d1cc9197e8e4844e38592 - F src/vacuum.c 03309a08d549f9389cc3a3589afd4fadbdaf0679 - F src/vdbe.c 5ed06318aac5d57849170a8bf39e807c22c5fedd + F src/vacuum.c db6415fd0f1be191e16228457a6deb9f232e6ad6 + F src/vdbe.c e05765736504d9dbcbb3dfa8964932780002ec39 F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2 F src/vdbeInt.h d7ea821ac7813c9bea0fe87558c35e07b2c7c44d -F src/vdbeapi.c fc3787eb2f5487d4cc3444de42d56f2e39d311f5 +F src/vdbeapi.c 2d8304acf89303a070a158937c13b9697a6721ab - F src/vdbeaux.c 42ed644fea54c3fbfa70af7c65456ec4ab089c77 + F src/vdbeaux.c 2e4a421bd3771ecd3b6c9a1c7abc7270a787a01b F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4 F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 @@@ -473,9 -471,8 +474,9 @@@ F test/lock4.test f4f36271aa5ae1da44964 F test/lock5.test 6b1f78f09ad1522843dad571b76b321e6f439bf7 F test/lock6.test 862aa71e97b288d6b3f92ba3313f51bd0b003776 F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64 +F test/lock_proxy.test 364b6c6220c023b57fc37eb52ec97c1f5c682c47 F test/lookaside.test 1dd350dc6dff015c47c07fcc5a727a72fc5bae02 - F test/main.test 0fdc4b9b1510d522f2ff39d02569bffb2a8132aa -F test/main.test 2be2352ac77ac5b238c6337a5469aeeef57677e6 ++F test/main.test 86565d07880b683b36cf4631d03bd9ff9922c63d F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9 F test/malloc.test d23580e15c33ee0353717129421b077541e910dc F test/malloc3.test 4bc57f850b212f706f3e1b37c4eced1d5a727cd1 @@@ -596,7 -593,7 +597,7 @@@ F test/tclsqlite.test bf4227eb236a4c097 F test/tempdb.test 1bf52da28a9c24e29717362a87722dff08feb72b F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05 - F test/tester.tcl 6ae75e1f0b9e350279c627f467e9e04877032c5c -F test/tester.tcl f38dd7ca63d81197c853989dbd39dfa3582c9ce7 ++F test/tester.tcl 825ee2c154c31fce547c4b831692177d0a530bd1 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca @@@ -764,12 -762,12 +766,12 @@@ F tool/diffdb.c 7524b1b5df217c20cd0431f F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5 - F tool/lemon.c 3088e4dec7f93c6b0925cf5bac04c8b7c8688835 + F tool/lemon.c f3a625c38b5621674f27775b307ea100b6a7b62d F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc - F tool/mkkeywordhash.c 9216336085e7a7c226a35c0bd780239968f8304f + F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 -F tool/mksqlite3c.tcl 1da28229695fdebdfe8a7d19902ef6c76d6c1c2d +F tool/mksqlite3c.tcl 4478ffa3ed3fee37f753dae92af4054d9425c80f F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a @@@ -787,14 -786,14 +790,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f - P 5754a3a56144ee0e073c80651bf11cb23ee7f447 - R 7323af8ddb2eb0c03f543e7388fd01d2 -P 28d0d7710761114a44a1a3a425a6883c661f06e7 -R cb14a38f5906a10fa21936447376b66a ++P a3204d8a217d47e5120ab16918c1b7d4be5a021e 077a6bee2dd4668a5b13c37aa7d4c052350ec782 ++R 285e8b8dcdef148f0049020c6394997d U drh - Z d9dc7bd925f43ed454c2d64b11cfec19 -Z 437ad8ccf6b703d6a3f5435217fbeff7 ++Z 386d9a9da91cf1df72706a198ddb2ae5 -----BEGIN PGP SIGNATURE----- - Version: GnuPG v1.4.1 (Darwin) + Version: GnuPG v1.4.6 (GNU/Linux) - iD8DBQFLMlw/oxKgR168RlERAqe0AJ95kGF947T1/Hv023qrel6PpPEDoACfYPZx - GGM2E88rV8TlKteHMJC+R9o= - =1r0e -iD8DBQFLRIsWoxKgR168RlERAko3AJ9cRW4W+hFzWCSEF5rdeL83LKknrgCfQKRR -l/RSoin5yCY/+/3Q1I6oeNA= -=d16B ++iD8DBQFLRIxToxKgR168RlERAojmAJ9EzRc4OEWj0eJm08wIt5iNnckikgCfSAbn ++17IApgGE5dz73Fmj8EQ+3yU= ++=Saz1 -----END PGP SIGNATURE----- diff --cc manifest.uuid index 73280313f1,efd93353cd..16eaa7e9ba --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - a3204d8a217d47e5120ab16918c1b7d4be5a021e -077a6bee2dd4668a5b13c37aa7d4c052350ec782 ++541e2b488e4e40706e457c6d3b5647d53da02ce9