From: drh Date: Tue, 11 Oct 2011 14:19:38 +0000 (+0000) Subject: Merge the latest trunk changes into the apple-osx branch. X-Git-Tag: mountain-lion~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d92f761edf536847df3f32f0af2cd953357b53f;p=thirdparty%2Fsqlite.git Merge the latest trunk changes into the apple-osx branch. FossilOrigin-Name: 7e2c4898224f9fabf724a6d4e1ac597845a66f73 --- 0d92f761edf536847df3f32f0af2cd953357b53f diff --cc manifest index 042043c905,79c4572a2b..d693380d33 --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ - C Forward\sport\sthe\sApple-specific\schanges\sfrom\s[db5b7b778c]\sin\sthe\napple-osx-377\sbranch.\s\sFix\sthis\sup\sso\sthat\sit\swill\scompile\sand\srun\son\sLinux. - D 2011-10-10T23:53:48.384 -C Fix\srequirements\smarks\sassociate\swith\sSTAT3. -D 2011-10-11T12:39:19.194 ++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch. ++D 2011-10-11T14:19:38.772 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 55bbee3ada084d4aa4dab9e1e0d90a21aab8bbcf -F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897 ++F Makefile.in acb1a0b8fe8029196afe437f64ead3301731b6f0 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc b5e917439d5ed42364173d1648aae1d418e323ea + F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 - F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54 + F VERSION bb37c274b503bbe73f00ea4f374eb817cba4b171 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531 F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248 @@@ -102,12 -102,9 +102,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 - F main.mk b737d8be1b00b3bd684c38441ba0c6b95aedf95b -F main.mk aa43670ca62ce7a3f4d80a5f8980c9a9ad076903 ++F main.mk 8a89739e067374d14cc9a3908e16ee8e1c4a01a5 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac @@@ -121,19 -118,19 +121,19 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5 - F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a + F src/analyze.c 682fd999a01c897a682365a459190758b83de836 F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 - F src/backup.c 5774963f44ed38c56561033694d3a5ad516c556b -F src/backup.c 4fd4440c8f81339d8eb8e5d2df54b68d79e94f2f ++F src/backup.c 669f28886b46746e70233228231053fa8231c898 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 - F src/btree.c 71a65f9bbdc3c93bd0f043aa9148b751474cea5e -F src/btree.c b53e009bccb4cfcbcde074f586f0c1c6712a0e12 ++F src/btree.c 2fdd62dfdb11d4c10676d23f9b8259e6bb742931 F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3 - F src/build.c 851e81f26a75abbb98bd99a7c5f10e8670d867bb + F src/build.c 119937b0ae1ff4dcec8fdea53771acc95bafca51 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac - F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d + F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4 F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3 F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8 F src/expr.c f4dcaeb8252c4b16fcdc245660f70ed366bc6cdd @@@ -144,15 -141,15 +144,15 @@@ F src/global.c e230227de13601714b29f936 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 - F src/insert.c 3eea5a53d2644116fb865afaa4699fabe62b441c + F src/insert.c ca18783512323f74aaf4ee74b46ffd75ec80d031 F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/loadext.c 99a161b27a499fc8ad40745b7b1900a26f0a5f51 -F src/main.c 43664b68a0b0f8fe9edc7d987b42cb8e26298468 +F src/main.c 4aabaa8d510c08d59595be5d83c4d630e8200982 F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 +F src/mem1.c c390a8fce10912a770ebe6fa031f5f463649e7ae F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534 F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f @@@ -168,31 -165,30 +168,31 @@@ F src/os.c 0668c16ae226cd58cef8240e5edb F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 - F src/os_unix.c ed727d5822235e16519e82ba8bb355426381e1be - F src/os_win.c 3fc8f4bb69dd71b2dc6b48e8d5fb411748197470 - F src/pager.c 5cafaf3833fceefd21bfa4dd2254b71461663286 - F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1 -F src/os_unix.c 9da63854b702e0855ce13711a80d8bdcc5b69549 -F src/os_win.c fbe47c7fdc9a846a772bbf98719c328becad5f8a -F src/pager.c 8a6ac3e0d9694412076e2273e3c81e9c4e08758f ++F src/os_unix.c b84dfb5c8d7fd5a31cc892225bf8ecac23d3fed2 ++F src/os_win.c 2d6f0e6f7df4742ef4714d52f6dac2742580204e ++F src/pager.c b23e50bc7aa99e3b264537243a4f5cd2663d0734 + F src/pager.h dbcaa791e8b6c3a6b77c168c5c27deec289fb176 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58 F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050 - F src/pcache1.c c8982f7048a70b7fd37975a8f6c84d6bc294175a - F src/pragma.c 66661dbe8428dd3215bd4c8f8a43dd3326e0bf6f + F src/pcache1.c 24f5e85a78514584b46190260ba7ab0a66312197 -F src/pragma.c 68d7db4fc9de8bcfae94c1d43120531ec252b9c0 -F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4 ++F src/pragma.c 273515f0297eaa96b1fef35aba284cf277a3f1c2 +F src/prepare.c 9d7403fe75fefa134351b41400d09ba1b189134b F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 -F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2 +F src/select.c f3971442d59d06801ac3c712f2851ece8d1cdead - F src/shell.c 13fe2aeddc3cc90d6a273831d1f63736d1596f81 - F src/sqlite.h.in 9b74f2d71c15cc9e3f78c16474e2096a707ceba5 + F src/shell.c e8fe1251aee84baa2fb232ce83d938de25aa650f -F src/sqlite.h.in 821027573c481e45ba276b078a3ae9ebaeb9bb92 ++F src/sqlite.h.in bf76418cecff032925cf68bba391ec1c6b3374b2 +F src/sqlite3_private.h e3b586e0aa329075d99be7198df9bc80c5b19e2d F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93 - F src/sqliteInt.h e9a32825290cee916e3e0939c857a13801afc700 -F src/sqliteInt.h 2f66bf068131f0e499dd5e0abea3f68cd6b27b2d ++F src/sqliteInt.h 48d941b4f14ed4783257167084eea6b16cb71598 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d - F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf + F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e - F src/tclsqlite.c 3ef1dda2f1dc207c792eaadebf9d8adc44648581 + F src/tclsqlite.c 20578e66dda94b4d4db3d4478644a4dd9c6084a6 -F src/test1.c 0f41b7c67719207a5de24b009e172c4dcf189827 +F src/test1.c 63a00ab722cc49025a6f675bcda39bed83663a48 F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31 F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432 F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7 @@@ -203,9 -199,9 +203,9 @@@ F src/test8.c 6b1d12912a04fe6fca8c45bb9 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60 F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e -F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de +F src/test_backup.c 64fd6173ad99daade1227aa17c3ca0d18fa5e5fa F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2 - F src/test_config.c ab0434c9ae170664d9402d1e1826fd8d04100263 -F src/test_config.c baf4eda361adc7444bd452d352999fea351fe256 ++F src/test_config.c 0056646e54ccd0b816b710a58d2095b3440c2cb9 F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5 @@@ -224,11 -220,11 +224,11 @@@ F src/test_onefile.c 40cf9e212a377a6511 F src/test_osinst.c 62b0b8ef21ce754cc94e17bb42377ed8795dba32 F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8 F src/test_quota.c a391c866217e92986c6f523f05b08aa6956c8419 -F src/test_rtree.c 6d06306e29946dc36f528a3a2cdc3add794656f1 +F src/test_rtree.c a2eebb68c0f1463918cdfbe603cb2e869c551038 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0 F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f - F src/test_stat.c f682704b5d1ba8e1d4e7e882a6d7922e2dcf066c + F src/test_stat.c 69de4361c7a69fc1136d31ab7144408cd00805c7 -F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8 F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa F src/test_thread.c 35022393dd54d147b998b6b7f7e945b01114d666 @@@ -239,23 -235,23 +239,23 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705 F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56 F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec - F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0 + F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84 F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7 - F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e + F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa -F src/vdbe.c 60340bfb23f456ea0791cb28262a887363773371 +F src/vdbe.c 26deb38f5bd32ebeb2cb60853a52f2bf33d71641 F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755 F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98 -F src/vdbeaux.c b4d509749502554e67ed14268928e4cc038b8efb +F src/vdbeapi.c 335435e65443f38d3073b5043e80cbbb7090c2d9 - F src/vdbeaux.c 669fe607968e058ef49f7ed7846efde4fece5848 ++F src/vdbeaux.c 1387589c8bf9811d3a2824b5c5cd60e3d0e9a70b F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb - F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9 + F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56 F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790 -F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114 +F src/vdbetrace.c 4b92fe7355f682368203d29b2be7125cbab85e79 F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582 -F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9 -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a +F src/wal.c eea77c324942f7e31ce9c3a5e6e86c4a0424fa09 +F src/wal.h e75d87752bd5df3dc4152ee2cb3b0dcd0b309e5e F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f - F src/where.c b641d399cfd8588d0e20d9790d1582b663a732a8 + F src/where.c 12939ac49f5122eb11b5ca4c35b2fdd8eaae9833 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87 @@@ -277,12 -274,12 +278,12 @@@ F test/async2.test c0a9bd20816d7d6a2cec F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7 F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c -F test/attach.test 0e6f8de2589f11a5f474ef57fe5af2877e61c0e8 +F test/attach.test a1ddc40e5d7f7a81963ebf9bd76d727f9e9ba00c F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966 F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e - F test/attach4.test 31f9eb0ca7bdbc393cc4657b877903a226a83d4b + F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0 - F test/auth.test b047105c32da7db70b842fd24056723125ecc2ff + F test/auth.test ac996c81ad910148606f5c7e3b3f85d47c29960f F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882 F test/auth3.test a4755e6a2a2fea547ffe63c874eb569e60a28eb5 F test/autoinc.test bd30d372d00045252f6c2e41b5f41455e1975acf @@@ -585,12 -582,12 +587,12 @@@ F test/mallocH.test 79b65aed612c9b3ed2d F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6 F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9 -F test/malloc_common.tcl 2930895b0962823ec679853e67e58dd6d8198b3c -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e +F test/malloc_common.tcl 11838863dc689f2d2b10896c8f4276771a60b42f +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577 F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f - F test/memdb.test dc9b87a595368c6b2db275bb136793b17722d58d -F test/memdb.test 708a028d6d373e5b3842e4bdc8ba80998c9a4da6 ++F test/memdb.test 499d199e612bc229f52d1c46c6038deeef93d1f2 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2 - F test/memsubsys1.test e9768f284f0fda54c66fb7c0e692b5d3eb7dd06b -F test/memsubsys1.test 16ce163ac1ace3d71bf0eaa6a821ed153addd91f ++F test/memsubsys1.test fe8b830abe6317c615927b90d9edf48180b591c2 F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0 @@@ -613,19 -610,19 +615,19 @@@ F test/notify3.test a86259abbfb923aa27d F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347 F test/null.test a8b09b8ed87852742343b33441a9240022108993 F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394 - F test/oserror.test 3fe52e0bd2891a9bf7cdeb639554992453d46301 - F test/pager1.test 1fb47476f57ebafa05a157b73ec7a10e96c1ac10 + F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3 -F test/pager1.test 1b630b3248c7d28862fe9e190cfe52234b502504 ++F test/pager1.test 30058ab9a507bee4ea95a6279e3fa1fac6758679 F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f -F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442 +F test/pagerfault.test a15ef77c8495882d7debb43794e87b6e46174c8a F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401 F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7 - F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806 + F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0 F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0 F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16 - F test/pcache2.test bc67c6802989dba05cdf3a4574fd882e238c7ecf + F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 F test/permutations.test ad17319066a90e2db71823c3ff104795ffc71b31 -F test/pragma.test c8108e01da04f16e67e5754e610bc62c1b993f6c +F test/pragma.test 68f2a9a4ac4cb8f198947c18905377002c88a6aa F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 @@@ -689,23 -686,23 +691,23 @@@ F test/speed4.test abc0ad3399dcf9703abe F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298 - F test/stat.test 0997f6a57a35866b14111ed361ed8851ce7978ae + F test/stat.test 36bc951bdc2beac4224cc54396fd6a7dc65336f4 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796 F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4 F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a - F test/superlock.test b68339e473d26cdeabe784ef14d7522334ec22c3 -F test/superlock.test 7b1167925e9d30a5d1f0701d24812fdda42c3a86 ++F test/superlock.test 942b75cfe0f939086715a5dc74fa4ba57a5e8d5e F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85 F test/syscall.test 966addf703faee6a5d509abe6d8885e393e552fd F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f - F test/table.test 50c47f5fe9c112e92723af27cd735e6c92de6f85 + F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126 F test/tclsqlite.test 5ebcbb0dccc3fbc1edc3bba84c38e2c2d574c5aa -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18 F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d -F test/tester.tcl 0b2999b578964297663de4870babbbee29225622 +F test/tester.tcl 73327b8ef71ac6338a8811f6e3dee41715332f08 F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 @@@ -889,28 -887,28 +892,28 @@@ F test/vtabF.test fd5ad376f5a34fe0891df F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d -F test/wal.test e11da8d5ea8a38a247339455098357e9adf63d76 -F test/wal2.test ad6412596815f553cd30f271d291ab003092bc7e -F test/wal3.test 18da4e65c30c43c646ad40e145e9a074e4062fc9 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c -F test/wal5.test 1bbfaa316dc2a1d0d1fac3f4500c38a90055a41b -F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3 +F test/wal.test fa19bdb3be5103b69052cc6c4bf86df54c845a59 +F test/wal2.test cc834aa5e4361b472d115f7c8148e4d168e4db8c +F test/wal3.test b9b6477ef354fea2066083e5badbc08bba45f5b0 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d +F test/wal5.test 3ef2b561d0e218b73b86f2223ec3d8f09cadc3ca +F test/wal6.test c561d1e44c89f9cb458a7b03003ed4baac08ba07 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877 -F test/walbig.test 0ab8a430ef420a3114f7092e0f30fc9585ffa155 -F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde -F test/walcrash.test 4fcb661faf71db91214156d52d43ee327f52bde1 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142 -F test/walfault.test efb0d5724893133e71b8d9d90abdb781845a6bb0 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3 +F test/walbak.test b30cbbb2996947c96a2e562020dff61013a17a96 - F test/walbig.test 78ac493db2abdb65b9c6cace5b851cc32df1d449 ++F test/walbig.test 44141082891fb91bcfa793fb6411605ac42830eb +F test/walcksum.test 3dff8817d31a4207d1ad31e7da06073a34e7fe1c +F test/walcrash.test e2e8de53cadda0e1c5ceb86ff762b85aed2771cc +F test/walcrash2.test c032d0040374ae28b41f99fc0cc290b4e2e34f17 +F test/walfault.test c54e6a304d631565a12998fd1d4665ded7a18ee2 +F test/walhook.test c934ac5219fee2b4e7653d291db9107b8dc73bba +F test/walmode.test 9308ffc25555a1c4eaa44a863792240406637496 F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496 - F test/walpersist.test 45fb0c94fb63908e2d66b1d99ce4645bfce0fa1e - F test/walro.test 05769ae10ddce1b6ad41bdd5326ab7ef951c8278 + F test/walpersist.test fd40d33765b2693f721c90c66d97f99757559006 -F test/walro.test 412d0809300b94ba142440e94d6a30eabf2220b7 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a -F test/walthread.test a2ed5270eb695284d4ad27d252517bdc3317ee2a ++F test/walro.test 4549618ff78efd6f9d042f3e6b17afe83a610526 +F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417 +F test/walslow.test 3c2475d7672511380d33cef1924a065d2ad62ff0 +F test/walthread.test 3decc7e72594e0270dc1a1cc0984d6db7165b4cc F test/where.test de337a3fe0a459ec7c93db16a519657a90552330 F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554 F test/where3.test 8e1175c7ef710c70502858fc4fb08d784b3620b9 @@@ -967,8 -965,8 +970,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402 F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f - F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2 - P ade72b1874c7672ae8d62b9ebac8e4d63fee80cc db5b7b778c09c57501cb8266895a0ea4f2de7649 - R 492a1b6738940e27b5c3378a18dde5be + F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P e5169f9a5b7e20b8adaf6ebb7868a64e44fd7321 -R fa1bfea306973bc99ccb0d80c9355cfe ++P 6cb43f6c6e9d8054e00acab378b8af0d82d3084c 9325c1a8c413dfbf0381190d8347f0a446ae5f5b ++R 35e8d9aed92da5f4989d13fbcde43536 U drh - Z 7f2d52c0164fc6fa32a2a1d8b7959b0c -Z 7aa6c1f7c4e6214ddb2d3b34feac8ca1 ++Z 25803df07d204a173fc151f91f24e41d diff --cc manifest.uuid index fb06f2d625,076bf3c8fd..c7c105ed2f --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 6cb43f6c6e9d8054e00acab378b8af0d82d3084c -9325c1a8c413dfbf0381190d8347f0a446ae5f5b ++7e2c4898224f9fabf724a6d4e1ac597845a66f73 diff --cc src/sqlite.h.in index c6ec1e2285,3d210c31d1..9a95b2a718 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@@ -767,22 -766,23 +767,28 @@@ struct sqlite3_io_methods ** That integer is 0 to disable persistent WAL mode or 1 to enable persistent ** WAL mode. If the integer is -1, then it is overwritten with the current ** WAL persistence setting. + ** + ** ^The [SQLITE_FCNTL_OVERWRITE] opcode is invoked by SQLite after opening + ** a write transaction to indicate that, unless it is rolled back for some + ** reason, the entire database file will be overwritten by the current + ** transaction. This is used by VACUUM operations. */ -#define SQLITE_FCNTL_LOCKSTATE 1 -#define SQLITE_GET_LOCKPROXYFILE 2 -#define SQLITE_SET_LOCKPROXYFILE 3 -#define SQLITE_LAST_ERRNO 4 -#define SQLITE_FCNTL_SIZE_HINT 5 -#define SQLITE_FCNTL_CHUNK_SIZE 6 -#define SQLITE_FCNTL_FILE_POINTER 7 -#define SQLITE_FCNTL_SYNC_OMITTED 8 -#define SQLITE_FCNTL_WIN32_AV_RETRY 9 -#define SQLITE_FCNTL_PERSIST_WAL 10 -#define SQLITE_FCNTL_OVERWRITE 11 +#define SQLITE_FCNTL_LOCKSTATE 1 +#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2 +#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3 +#define SQLITE_FCNTL_LAST_ERRNO 4 +#define SQLITE_FCNTL_SIZE_HINT 5 +#define SQLITE_FCNTL_CHUNK_SIZE 6 +#define SQLITE_FCNTL_FILE_POINTER 7 +#define SQLITE_FCNTL_SYNC_OMITTED 8 +#define SQLITE_FCNTL_WIN32_AV_RETRY 9 +#define SQLITE_FCNTL_PERSIST_WAL 10 ++#define SQLITE_FCNTL_OVERWRITE 11 + +/* deprecated names */ +#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE +#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE +#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO /* ** CAPI3REF: Mutex Handle diff --cc src/test_config.c index b7e0ab8faa,b0efe23247..35f1f0d389 --- a/src/test_config.c +++ b/src/test_config.c @@@ -564,28 -566,6 +576,22 @@@ Tcl_SetVar2(interp, "sqlite_options", " #else Tcl_SetVar2(interp, "sqlite_options", "yytrackmaxstackdepth", "0", TCL_GLOBAL_ONLY); #endif - - #ifdef SQLITE_PAGECACHE_BLOCKALLOC - Tcl_SetVar2(interp, "sqlite_options", "blockalloc", "1", TCL_GLOBAL_ONLY); - #else - Tcl_SetVar2(interp, "sqlite_options", "blockalloc", "0", TCL_GLOBAL_ONLY); - #endif + +#ifdef __APPLE__ +# if defined(__ppc__) + Tcl_SetVar2(interp, "os_options", "arch", "ppc", TCL_GLOBAL_ONLY); +# elif defined(__i386__) + Tcl_SetVar2(interp, "os_options", "arch", "i386", TCL_GLOBAL_ONLY); +# elif defined(__x86_64__) + Tcl_SetVar2(interp, "os_options", "arch", "x86_64", TCL_GLOBAL_ONLY); +# elif defined(__arm__) + Tcl_SetVar2(interp, "os_options", "arch", "arm", TCL_GLOBAL_ONLY); +# else +# error Unrecognized architecture for exec_options +# endif +#else + Tcl_SetVar2(interp, "os_options", "arch", "unknown", TCL_GLOBAL_ONLY); +#endif #define LINKVAR(x) { \ static const int cv_ ## x = SQLITE_ ## x; \ diff --cc test/memdb.test index 92810a106d,1da3d7c58b..2774443187 --- a/test/memdb.test +++ b/test/memdb.test @@@ -11,7 -11,7 +11,6 @@@ # This file implements regression tests for SQLite library. The # focus of this script is in-memory database backend. # --# $Id: memdb.test,v 1.19 2009/05/18 16:04:38 danielk1977 Exp $ set testdir [file dirname $argv0] @@@ -407,27 -407,24 +406,27 @@@ do_test memdb-8.2 # Test that auto-vacuum works with in-memory databases. # -ifcapable autovacuum { - do_test memdb-9.1 { - db close - sqlite3 db test.db - db cache size 0 - execsql { - PRAGMA auto_vacuum = full; - CREATE TABLE t1(a); - INSERT INTO t1 VALUES(randstr(1000,1000)); - INSERT INTO t1 VALUES(randstr(1000,1000)); - INSERT INTO t1 VALUES(randstr(1000,1000)); - } - set memused [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1] - set pgovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 1] - execsql { DELETE FROM t1 } - set memused2 [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1] - expr {($memused2 + 2048 < $memused) || $pgovfl==0} - } {1} +set msize [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] +if {[lindex $msize 2]!=0} { - ifcapable autovacuum&&!blockalloc { ++ ifcapable autovacuum { + do_test memdb-9.1 { + db close + sqlite3 db test.db + db cache size 0 + execsql { + PRAGMA auto_vacuum = full; + CREATE TABLE t1(a); + INSERT INTO t1 VALUES(randstr(1000,1000)); + INSERT INTO t1 VALUES(randstr(1000,1000)); + INSERT INTO t1 VALUES(randstr(1000,1000)); + } + set memused [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1] + set pgovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 1] + execsql { DELETE FROM t1 } + set memused2 [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1] + expr {($memused2 + 2048 < $memused) || $pgovfl==0} + } {1} + } } } ;# ifcapable memorydb diff --cc test/walro.test index 4dbfa08840,a8c489a792..a39ed7fe1d --- a/test/walro.test +++ b/test/walro.test @@@ -24,13 -24,13 +24,20 @@@ if {$::tcl_platform(platform) != "unix" return } +# these tests can't deal with the location of the -shm file under proxy locking +# +if {[forced_proxy_locking]} { + finish_test + return +} + + # And only if the build is WAL-capable. + # + ifcapable !wal { + finish_test + return + } + do_multiclient_test tn { # Do not run tests with the connections in the same process. #