Merge all the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: 6723add4f492c30b20db8de6ed818c191dedea40

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 8a72fe106a309112fa4fae0534ad27982de433a9,f48746c07cb9628762d4788aa8789687d8ae2ed9..223d5530f132930f4d2ba9e9f8e0ca9a907e0d3c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Cherrypick\s[8c9ee1d78f]\sand\s[e416359633]\sfrom\strunk:\nEnsure\sthat\sthere\sis\salways\sat\sleast\sone\saReadMark\sslot\susable\sby\san\sunprivileged\sreader\swhile\sa\scheckpoint\sis\srunning.\sAlso,\sif\sone\sor\smore\stransactions\sare\srecovered\sfrom\sa\slog\sfile,\sinitialize\sone\sof\sthe\saReadMark\sslots\sto\scontain\smxFrame\sas\spart\sof\sthe\srecovery\sprocess.
- D 2012-07-17T17:46:21.303
 -C When\sthe\ssame\sindex\sis\sused\sfor\sall\sOR-terms\sin\sa\sWHERE\sclause,\sthen\stry\sto\nuse\sthat\sindex\sas\sa\scovering\sindex.
 -D 2012-08-24T23:56:19.679
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2012-08-25T01:38:39.061
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in f4e42073f1092a09a9cbd42aecf2f33790208cb5
 -F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
++F Makefile.in c2d205d441ae3b96b2df35a2bd3e3dcef697b55a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc fd86027849a59a2f621b791b79eabf3f8ffbd684
- F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
+ F Makefile.msc 45dd3579cae399d73e3f5eab36f6f332783072e5
+ F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
+ F VERSION a71848df48082f1d6585d4b0819d530fc455485d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -101,12 -101,9 +101,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  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 ad374605041017b90b4e9e55a57bf6f370ba8456
 -F main.mk 72026405046ed5b1f0368943b89c0aa29ad558b6
++F main.mk 19df6c439d54aa254a1e372bb5c453540700a3e0
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -120,78 -117,75 +120,76 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c 149cc80d9257971b0bff34e58fb2263e01998289
- F src/analyze.c 70c46504c0d2543ea5cdca01140b2cd3e1d886e7
+ F src/analyze.c 7553068d21e32a57fc33ab6b2393fc8c1ba41410
  F src/attach.c 577bf5675b0c50495fc28549f2fcbdb1bac71143
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c d7fb4c6d2ad3fe51a4ce1a897fde7b00f4de5fef
- F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
+ F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
+ F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 453a91808ad20154ff2ee6ff57e8e563ad093783
- F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
- F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
- F src/build.c 47c4506afe4bcb4ed1f4b5357582d1cb3402f8ad
 -F src/btree.c 32dc63ef18c6a8d448c37c030ced70cf23ccad75
++F src/btree.c 31cf99fcac5cd4855dd5c5377b07936abdeac34d
+ F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
+ F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
+ F src/build.c 196734374128023e414a818f2051d836badb3526
  F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 500d019da966631ad957c37705642be87524463b
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
- F src/expr.c 06a7733d19dc725dc46ba51afd9feadb4b85d991
+ F src/delete.c 335f36750dc6ac88d580aa36a6487459be9889de
+ F src/expr.c 217840a107dcc1e5dbb57cea311daad04bedbb9a
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c 067e50003af2b3c3b2f65575837ae8ef4be676f9
+ F src/fkey.c 9c77d842dc9961d92a06a65abb80c64ef1750296
 -F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
++F src/func.c 32552a2c57cf2ed3ca7f8aa3e2a3101da021a4dd
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
- F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
+ F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 0bbffe75c254c62a5686ab5e7f88e29235e16174
+ F src/insert.c 770ed633830fb49d73d90c3fdf20b703973e1e84
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 0d708b9357776b5c9c36299def91df1d44e31e21
 -F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09
++F src/main.c f528c0706b009b5019002ab92043fdf83e30911e
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
+ F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
  F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
  F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
- F src/mutex.h 2a79e0c10c26412546b501ee0f3d92b42decf63e
+ F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
- F src/mutex_os2.c 882d735098c07c8c6a5472b8dd66e19675fe117f
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c db8970270841e2385a43602477e84c4b19aff1db
+ F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 -F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 +F src/os.c 4c8c8d72a6c58ad2fde4865783e8ae26b494a85e
- F src/os.h 38aabd5e3ecd4162332076f55bb09cec02165cca
+ F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c 767d9ae4edd0ac186a6927f4b4b7e658f50c4542
- F src/os_win.c 85f7d60e3563efc81a06b075a76b1f9ccada73b0
 -F src/os_unix.c b5149a3343a6acd6c9df4e3acf5085a6501c1f68
 -F src/os_win.c 88f8cc4ffdbb47e0f8f8b60110fcf90e461c5fb4
 -F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
 -F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
++F src/os_unix.c 7f7816723a1cf08c6fb816c7a05665682c30c79e
++F src/os_win.c 6897cd3945f316e016a955c08bdc466b2f60fd3a
 +F src/pager.c ca8424ef9b807ab86381c5b0450ce4752670e16e
 +F src/pager.h 491e782fbefc83e115f85588987ebb7d00d9fde6
  F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
- F src/pcache1.c 2234d84f9c003d800a57f00f8535c91667fa4f6c
- F src/pragma.c 6d617d3e19e3cad43d2e2e6335602ecbc0fe631c
+ F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
 -F src/pragma.c 97f9357f0e7e5fb46a2519f14539550aa07db49f
 -F src/prepare.c 33291b83cca285718048d219c67b8298501fa3a5
++F src/pragma.c bf2a8023aa8bb251fc0660eb5560bc6efec530fb
 +F src/prepare.c 5e2babd80c5771354ffc1eddfea41fc08e43ffed
- F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
+ F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
+ F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c 7bc4a2e66ae0fc40bb46038441e3e7bf138d7079
- F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
- F src/sqlite.h.in a061e38514ff4a3ef5876126991607829e63f829
 -F src/select.c a9d68e04f07348038ac279f3316ee8f8e146f59a
++F src/select.c 98102767fb76d90dc3071be091751ee046d59792
+ F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
 -F src/sqlite.h.in f664797c68ced43c2ea2c541d4ec8e1e04ec68ac
++F src/sqlite.h.in e17c8cae7cde16c72e9c20bc01e960245e24af0e
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 81f3ce54d7485b600df4102202390461df947092
 -F src/sqliteInt.h 497e89baddee92a4769cbc2c169b654a223f75d6
++F src/sqliteInt.h a6ca480c349a39569d44e4bf9c98b45afd6437c9
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
- F src/test1.c 03bcc5724fecac86ea8837e701807a653d82f77d
 -F src/test1.c 3d70f7c5987f186884cfebbfa7151a7d3d67d86e
++F src/test1.c 23fdc06ec3bd0809eafb7168ceb165e3b8a50b8a
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -202,12 -196,12 +200,12 @@@ F src/test8.c 8bcce65e5ee027fbfd7da41d2
  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 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c a76e8a64c9b4833eb878188e1c490d0e6965d554
 -F src/test_config.c 09781397ccc24268cb895be0d4c21b4aad651486
++F src/test_config.c e8a50ba3bdd9b191f9078c7d2ce068ae7d99117c
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_func.c 090f2c3339e85c2c964435f99aed6f3da9d59525
+ F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
  F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
@@@ -222,14 -216,14 +220,14 @@@ F src/test_mutex.c a6bd7b9cf6e19d989e31
  F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
  F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
- F src/test_quota.c 0af3e1e9a1f22bc5f431dd3efcc32762f4109f58
+ F src/test_quota.c 8ab295092c70903ca6f3209fa4c75f5cb6c1bf8e
  F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
 -F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 +F src/test_rtree.c a1bbfc30f14d2bad2f93dbea7dcc697c97a40c66
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
- F src/test_spellfix.c 495535f3eb57acdc384572da570e869bb1834bf4
+ F src/test_spellfix.c fa83c9b4c4bdd1d41be4ad1e9241bf5a4fc9190f
  F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 -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 e286f2173563f2a1747c24bcda6b9d030bf4f4e4
@@@ -239,26 -233,27 +237,27 @@@ F src/test_wholenumber.c 3d2b9ed1505c40
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
- F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
+ F src/update.c 28d2d098b43a2c70dae399896ea8a02f622410ef
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
+ F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
- F src/vdbe.c ae6803fd2e96e11898ee5d98dfa9854b4b53033f
 -F src/vdbe.c 75da79cdcd58481825a06f045bc2f5ea3966eeae
++F src/vdbe.c 18781e846c0fc14a6bccf3dccc4d9e78ad7d4846
  F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
- F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
- F src/vdbeapi.c bf1f632719ee596d43ccf6c2ed68ff8911f5b376
- F src/vdbeaux.c 88b9df24bcab179fbe7a39df7b3e17cce6f372d7
+ F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
 -F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 -F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
++F src/vdbeapi.c 31936c1666c789cc8eac1872f681ad38867e8c47
++F src/vdbeaux.c 5c738e03c2aab3cf98d3a753603320c36975d9e9
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
- F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
- F src/vdbetrace.c 6700008a6a05e6e39531ed252c32557ceb962b91
+ F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
 -F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
++F src/vdbetrace.c 36c1ae141327a5352e5656fd448194b6927bc763
  F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
 -F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 +F src/wal.c c981d242bbb28ae3fc4889528a5621cc564d3ed2
 +F src/wal.h ce626f1f9000caf09a99a6634a8d794686f92e1b
- F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 24c7494d8875ead994b4dfe5461340c27fd424ca
+ F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
+ F src/where.c 9a28820fb0ead5674d5b45dfdb32aef913fe40c3
 -F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 +F test/8_3_names.test 0ed0f6711fefac33829ef9f1d6ca3c56c48ef1c7
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
+ F test/aggnested.test 0be144b453e0622a085fae8665c32f5676708e00
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
  F test/alter.test 57d96ec9b320bd07af77567034488dcb6642c748
@@@ -278,10 -273,11 +277,11 @@@ F test/async2.test c0a9bd20816d7d6a2cec
  F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c
 -F test/attach.test 0d112b7713611fdf0340260192749737135fda5f
+ F test/atof1.test 9bf1d25180a2e05fc12ce3940cc8003033642f68
 +F test/attach.test 63033baa59be42c811ef0d4e73ebd2d6dba4805c
  F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966
  F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
  F test/auth.test 304e82f31592820d3bde26ab6b75deaa123e1a6f
  F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882
@@@ -367,9 -363,9 +367,9 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
- F test/date.test a18a2ce81add84b17b06559e82ad7bb91bc6ddff
+ F test/date.test f3228180c87bbe5d39c9397bf001c0095c3821b9
  F test/dbstatus.test 207e5b63fcb7b9c3bb8e1fdf38ebd4654ad0e54b
 -F test/dbstatus2.test b1de8250fde1f3474d6b86f0e89de38d84794f56
 +F test/dbstatus2.test 50ce645331b6fca84586bb0f03b274a4b4508ec3
  F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc
  F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -622,9 -618,9 +623,9 @@@ F test/misc3.test fe55130a43e444ee75e21
  F test/misc4.test 9c078510fbfff05a9869a0b6d8b86a623ad2c4f6
  F test/misc5.test 528468b26d03303b1f047146e5eefc941b9069f5
  F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
- F test/misc7.test 4337d84e441f36cee62656f9f7ba8bc22a7ca721
+ F test/misc7.test f00dad9a004da659330013e6f21819d018b683d3
  F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
 -F test/multiplex.test e08cc7177bd6d85990ee1d71100bb6c684c02256
 +F test/multiplex.test 85a4be2b23e7294d468b6e3a578ec00020723bee
  F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
  F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
  F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
@@@ -645,10 -641,10 +646,10 @@@ F test/pagerfault2.test 1f79ea40d1133b2
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 -F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
 +F test/pcache.test fa8a2b0677225765eced806d9d1676b78a9e2c40
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test 2af90e00cea9e7e7c0a6b16d34727cb5bbae14dd
- F test/pragma.test 37d3475b699de6d7846bca81de3d0324b3a45054
+ F test/permutations.test d12fabf8abdb71b79eb6c3ef3be5e875fe790071
 -F test/pragma.test a62f73293b0f0d79b0c87f8dd32d46fe53b0bd17
++F test/pragma.test eaf172eb376b20b9d6c639e03903dd43e476f0b8
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -722,9 -719,10 +724,10 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
+ F test/spellfix.test 4e339920585e7555660bd3b11cf338af82c656ae
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 -F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stat.test 4ce96d67f6a0bc9647a042c7140cf1c56e049a69
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test d4aea23ac267463d4aa604bf937c3992347b20f7
  F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -930,30 -928,30 +933,30 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839
 -F test/wal.test a040047d7f2b9f34bc4d597964e5e7c09609c635
 -F test/wal2.test 7ca814723c487de87d945cdc85c9a0fa45fa8de8
 -F test/wal3.test b22eb662bcbc148c5f6d956eaf94b047f7afe9c0
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test f58ed4b8b542f71c7441da12fbd769d99b362437
 -F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 5ab217d21f7e5e86af2933a4ffd0d8357cc2c0bd
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 -F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde
 -F test/walcrash.test 4457436593be8c136f9148487c7dccd5e9013af2
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walcrash3.test 595e44c6197f0d0aa509fc135be2fd0209d11a2c
 -F test/walfault.test 97394d8de82a99f7abf1c12ed229640607fd0ad2
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test a31deb621033442a76c3a61e44929250d06f81b1
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/wal.test 5759631b0e610d616c33cc21124b3395f39cd0c7
 +F test/wal2.test 583ce66003086387a7301c0b62e549026f2a50ed
 +F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 187ae92cc9ba1ec6803681b9025cad89af1a8c69
 +F test/wal6.test c561d1e44c89f9cb458a7b03003ed4baac08ba07
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test a0b7dee73fc3d3bbf167e04533d37df379a0b7d1
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
 +F test/walcksum.test 6510e82303f6fffc2c55bb77a7774cd0eed21a6e
 +F test/walcrash.test a8fa8d8a9a50a49b7abaf8a4a7e2c7ea352c49be
 +F test/walcrash2.test c032d0040374ae28b41f99fc0cc290b4e2e34f17
 +F test/walcrash3.test 97e775404f4c76e5c46f71fbd09691c7e9c25c68
 +F test/walfault.test e5309befcaf4ab08151c35dba20cc5b8a5846748
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
- F test/walro.test 78f389d11e4a32e329feb9b63859ebc3081bbea0
++F test/walro.test 3ce5c1d16a3d8c6b2f7504d44d1ebf1098efaa64
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
- F test/walthread.test c3aaf9ef7ad21ae79c2345425bfddb39cdac954f
++F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 4c9f69987ed2aa0173fa930f2b41ab9879478cd8
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
@@@ -983,12 -984,13 +989,13 @@@ F tool/lempar.c 01ca97f87610d1dac6d8cd9
  F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 105023aa86f696a74b1d6a4929d1e1c3baf9471c
- F tool/mksqlite3c.tcl 2139ffe033d586b265e0c0bb0cabe706016b9dda
+ F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 -F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
++F tool/mksqlite3c.tcl 4edfe153b7e9f7b5e3df5ef5dd2e28a4c7fd3aed
  F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
- F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
+ F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
+ F tool/mkvsix.tcl 19b2ab9ea16445953a76568a5bbe4cb864f92dfe
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
- F tool/omittest.tcl 72a49b8a9a8b0bf213a438180307a0df836d4380
+ F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
  F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
  F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
@@@ -1010,7 -1012,8 +1017,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 892d8779cc3c4037d6e21c04c39796284d811157
- R ab4b327459cf45e2530a4cdced0d9405
+ F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
 -P d4cd6017c9875947a05b1dc36538d4272fb18739 b722143d075979ba3d92b7b29e576ce2307187d1
 -R d51bc6dccf316fa29f046fa529eea646
++P 65035912264e3acbced5a3e16793327f0a2f17bb 62678be3df35cdcb09172ba8c860f7b73517f1ea
++R b7154cfc03245665be15aa1058bdd068
  U drh
- Z 7a54c87c3e8e79189a731257e2592a5b
 -Z 88e4cd6b2ce7efc36bc2db59aa6b0ac5
++Z 599d4bbcc43dc383fa81ddbf81d82915

diff --cc manifest.uuid
index e07a5f6bdf42dc6b244ac2c87f20e04d3b5c0b36,100c67b276c997f9c6adea44085952c3c7755e90..5ac1012068dd26a94195a50aa613f2e92e1337a1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 65035912264e3acbced5a3e16793327f0a2f17bb
 -62678be3df35cdcb09172ba8c860f7b73517f1ea
++6723add4f492c30b20db8de6ed818c191dedea40

diff --cc src/btree.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/main.c
index ad15fac0ab9753521841ef7379deba8622e5dc89,16294a619977abac0edd5dd980716eb756526f4b..1f7b7c9c5d1cbeb44ed9b484bf08108332e2e89e
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -900,12 -947,7 +950,11 @@@ void sqlite3LeaveMutexAndCloseZombie(sq
    if( db->lookaside.bMalloced ){
      sqlite3_free(db->lookaside.pStart);
    }
 +#ifdef SQLITE_ENABLE_SQLRR
 +  SRRecClose(db);
 +#endif
 +  
    sqlite3_free(db);
-   return SQLITE_OK;
  }
  
  /*

diff --cc src/os_unix.c
index 28582f6ac64abe4caac95b9f85f03f2bd9fae694,a0326c963e5f7fd7c0d117a9b36f4caba82f8e05..48f7904111b12ad22d0b06ba41274759b2b1825c
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -2114,19 -1760,11 +2114,19 @@@ static int posixUnlock(sqlite3_file *id
        lock.l_type = F_UNLCK;
        lock.l_whence = SEEK_SET;
        lock.l_start = lock.l_len = 0L;
 -      if( unixFileLock(pFile, &lock)==0 ){
 +      if( unixFileLock(pFile, &lock, 10)==0 ){
          pInode->eFileLock = NO_LOCK;
        }else{
 +#if OSLOCKING_CHECK_BUSY_IOERR
 +        tErrno = errno;
 +        rc = sqliteErrorFromPosixError(tErrno, SQLITE_IOERR_UNLOCK);
 +        if( IS_LOCK_ERROR(rc) ){
 +          storeLastErrno(pFile, tErrno);
 +        }
 +#else
          rc = SQLITE_IOERR_UNLOCK;
-           storeLastErrno(pFile, errno);
 -        pFile->lastErrno = errno;
++        storeLastErrno(pFile, errno);
 +#endif
          pInode->eFileLock = NO_LOCK;
          pFile->eFileLock = NO_LOCK;
        }

diff --cc src/os_win.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
index 988032bbd303cd5274edd6f20d5a46ad6386dd1b,b9a88a6ab8f444531c932f423bc9209666be4131..43042bc3475820e8cf3e54e631482a9251e7d300
--- 1/src/vdbeapi.c
--- 2/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@@ -74,21 -70,12 +74,15 @@@ int sqlite3_finalize(sqlite3_stmt *pStm
      rc = SQLITE_OK;
    }else{
      Vdbe *v = (Vdbe*)pStmt;
 +#ifdef SQLITE_ENABLE_SQLRR
 +    SRRecFinalize(pStmt);
 +#endif
      sqlite3 *db = v->db;
- #if SQLITE_THREADSAFE
-     sqlite3_mutex *mutex;
- #endif
      if( vdbeSafety(v) ) return SQLITE_MISUSE_BKPT;
- #if SQLITE_THREADSAFE
-     mutex = v->db->mutex;
- #endif
-     sqlite3_mutex_enter(mutex);
+     sqlite3_mutex_enter(db->mutex);
      rc = sqlite3VdbeFinalize(v);
      rc = sqlite3ApiExit(db, rc);
-     sqlite3_mutex_leave(mutex);
+     sqlite3LeaveMutexAndCloseZombie(db);
    }
    return rc;
  }

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbetrace.c
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc test/walro.test
index 27d73e176ba3facb79e79baadc4266772facda7f,465ce838c2dc8de63d3f72022a2eae8237b1650a..170c2d8ad35168fe0f53e05170664e9ec2d9340e
--- 1/test/walro.test
--- 2/test/walro.test
+++ b/test/walro.test
@@@ -300,8 -290,6 +302,6 @@@ do_multiclient_test tn 
    } {}
  }
  
 -finish_test
 -
 +forcedelete $shmpath
  
- 
- 
 +finish_test

diff --cc test/walthread.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge