Merge changes through release 3.7.2 into the apple-osx branch.

FossilOrigin-Name: 415c448dc45a297bd1b0bbce25c4572eeab286f0

diff --cc Makefile.in
Simple merge

diff --cc configure
index d21a70db0528beee43876de32c4816dbd26308a7,3ac3077c199b148a93d13b8f9423aeeb76ea6f0e..3ac3077c199b148a93d13b8f9423aeeb76ea6f0e
mode 100644,100755..100644
--- 1/configure
--- 2/configure
+++ b/configure

diff --cc manifest
index 93b92a86183a59780be4ac10d39b9ad3886a8fdb,9fe69e1daae10a39e9e4f3233317ae71646730e8..1235819a567b35054be84bf62024cefe38c43513
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Merge\sthe\s3.7.1\spre-release\ssnapshot\schanges\sas\sof\s[2010-08-18]\s\ninto\sthe\sapple-osx\sbranch.
- D 2010-08-18T00:24:10
 -C Version\s3.7.2\srelease\scandidate\s1
 -D 2010-08-23T18:52:01
++C Merge\schanges\sthrough\srelease\s3.7.2\sinto\sthe\sapple-osx\sbranch.
++D 2010-08-24T01:08:11
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 9e1872338c526a5d6797f19dd04388f2a321e3d6
 -F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
++F Makefile.in c58f7d37ad0f9b28655ba4e28c6cb0f879569cd7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -24,7 -24,7 +24,7 @@@ F art/src_logo.gif 9341ef09f0e53cd44c0c
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 6058ffa62c2ad5a77621f62adfe19b45852f6511
 -F configure a5dab32df872ed3fe248c7f0cbc324595c169781 x
++F configure a5dab32df872ed3fe248c7f0cbc324595c169781
  F configure.ac 699040cc9abb7465dca5a2972bc89d227fd8f734
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@@ -128,24 -125,24 +128,24 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df
  F src/date.c 5dd8448a0bfea8d31fb14cff487d0c06ff8c8b20
  F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
- F src/expr.c 9532d71de52ad7a5523b0a4b9d7d64874560e328
+ F src/expr.c 9ee507c3dc6eaa5657cbd1dad026cdeda89c559f
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 58bbf52c6ddd3f64ca40a3230f9e548a83a5cb16
 -F src/func.c 464b0dc70618b896c402c574eb04bc5eacf35341
 +F src/func.c 62373e488ecf8b29a28548ff9d922a9fae36b808
  F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c a4995747c062256582a90b4f87f716e11b067050
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 6d422ea91cf3d2d00408c5a8f2391cd458da85f8
 -F src/main.c 99622181f36d68e9f2a851c7b34263b3dcd03470
 +F src/main.c 414f59006f66a665169327700ceb27c2fd0e7c72
  F src/malloc.c 19a468460c7df72de245f10c06bd0625777b7c83
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
 +F src/mem1.c 0f36f1eecd786240924a56f8796ffa850d47a96f
- F src/mem2.c 12c91260fd2320eda9355dea5445b137f848c05b
+ F src/mem2.c 9e5f72e38573db9598fe60d3fa530d473cc8714e
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
  F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff
  F src/memjournal.c 4a93a25ad9f76c40afa070ffd7187eb3a5fd7aee
@@@ -160,16 -157,16 +160,16 @@@ F src/os.c 60178f518c4d6c0dcb59f7292232
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
 -F src/os_unix.c 11194cbcf6a57456e58022dc537ab8c3497d9bb9
 +F src/os_unix.c 3853edc254c464c040232a0b422b8f513205399a
  F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
- F src/pager.c e75ccadfe01cf67e25a0abd5343cd84d7373dd71
 -F src/pager.c a5f5d9787b11dfb0b6082e6f5846d00b459a8e19
++F src/pager.c 8f6ff6ca8e7d478016fe1a28d270377066f4baf7
  F src/pager.h ef8c8f71ab022cc2fff768a1175dd32355be9dcd
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
- F src/pcache1.c 638844c118163e3a10e1e3265703adf74870312d
+ F src/pcache1.c e921e8a1d52c93abde63cb6dad1fa39770410c52
 -F src/pragma.c 8b24ce00a93de345b6c3bd1e1e2cfba9f63d2325
 -F src/prepare.c ce4c35a2b1d5fe916e4a46b70d24a6e997d7c4c6
 +F src/pragma.c 3dbb254a99d7a5ccaff8eb1f8689556ff82fe6d0
 +F src/prepare.c 23b5da0608820c9f76aa61d4955ebdbd23ffda36
  F src/printf.c 8ae5082dd38a1b5456030c3755ec3a392cd51506
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
@@@ -177,14 -174,13 +177,14 @@@ F src/rowset.c 69afa95a97c524ba6faf3805
  F src/select.c 8add6cab889fc02e1492eda8dba462ccf11f51dd
  F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
  F src/sqlite.h.in 2d72a6242df41c517e38eec8791abcf5484a36f1
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
  F src/sqliteInt.h e33b15e8176442bf7484f0e716edfd1ce03b2979
- F src/sqliteLimit.h 4ae9b005144400984cbcafd4d7c09659bb2af92a
+ F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 5cd96419fb6c771006f064196ccc70c29d01bec7
+ F src/tclsqlite.c cacee9482417b6fc6043f6bb831ff9496d46242d
 -F src/test1.c 55005c9781b157b1d215ba145768783b9abae78c
 +F src/test1.c 6abff878520c77f10891b06c36a57b3226ebc3d4
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
  F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
@@@ -493,13 -490,12 +494,13 @@@ F test/lock.test 842e80b6be816c79525a20
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
 -F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
 +F test/lock5.test d0d313f059ae5661726d3f197ba6ed8f69257d8e
  F test/lock6.test 8df56060f396151777390982422c800d026e1722
  F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
- F test/lock_common.tcl 57727421a6a850443944cbadfdf5a6dd9e4ac81c
+ F test/lock_common.tcl 18c637fc89e12f1ac0d27d2186f12c3d3f789e3e
 +F test/lock_proxy.test 9ea4307b186949fcfd012e4cd44149d2b6360da6
  F test/lookaside.test 382e7bc2fab23d902c8eafb1b9ed7ababfff75a6
 -F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252
 +F test/main.test 753e2b772c041bd8dbd17c7e4132b3981378eaab
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
  F test/malloc.test 927e6c8668a1d48c23aa6189bda02aff5a1b83de
  F test/malloc3.test 4bc57f850b212f706f3e1b37c4eced1d5a727cd1
@@@ -547,10 -543,10 +548,10 @@@ F test/notify3.test d60923e186e0900f481
  F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
 -F test/pager1.test 6922029d71a8090169c71a67a141b6b94ad17d50
 +F test/pager1.test 3c43e01a1daa7a843b8be832b87e719363f585f2
  F test/pager2.test 0fbb6b6dc40ce1fecfe758c555a748ad2e9beaa3
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
- F test/pagerfault.test 01e6fd28134f8c000273a5040dce1e089f5ae3a3
 -F test/pagerfault.test 84c6a4fcfe1a9e450fc1cec86f5baebfb017e53e
++F test/pagerfault.test f168ec2c659faccffc083ec1847bf4295dd67d14
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
  F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
@@@ -790,22 -787,22 +792,22 @@@ F test/vtabE.test 7c4693638d7797ce2eda1
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
- F test/wal.test 06430c11a0732b84231e30b466cc4265a57c07ea
 -F test/wal.test 70227190e713b3e7eb2a7d5ec3510b66db01f327
 -F test/wal2.test 223f3e14d475730af772a7f5862d4bcfa7565c3a
 -F test/wal3.test 695ea0f6c516423c611891df9a285aacd33344e3
 -F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
++F test/wal.test d83c3d227e9e9bb5c7a0c1447ea4a3c6cd5fced4
 +F test/wal2.test 998e1807c7bea96f1a5246adf670d02137118339
 +F test/wal3.test 2bc5bed33ba16db805ee00185c083a7c24070fe2
 +F test/wal4.test 6a68c45bc1ca24a3592ec449ddcb92b29d0e0e87
  F test/wal_common.tcl 895d76138043b86bdccf36494054bdabcf65837b
 -F test/walbak.test 4df1c7369da0301caeb9a48fa45997fd592380e4
 -F test/walbig.test e882bc1d014afffbfa2b6ba36e0f07d30a633ad0
 -F test/walcksum.test a37b36375c595e61bdb7e1ec49b5f0979b6fc7ce
 -F test/walcrash.test e763841551d6b23677ccb419797c1589dcbdbaf5
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walfault.test 05c470688d742688e455dd56816bd6bcffa298f8
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4ecd37284f245247f7935896ab66f6943f0432a0
 +F test/walbak.test 767e1c9e0ea0cfb907873b332883e66e187fa4bc
 +F test/walbig.test 78ac493db2abdb65b9c6cace5b851cc32df1d449
 +F test/walcksum.test cf6787f2ee1a6a3da6f0c2b20b9ede5153e4e03f
 +F test/walcrash.test 80c1cc3173a0ef09d8303fa556cb0187a36d82ea
 +F test/walcrash2.test 929c99d14ee2e3e3ef82585058968a8b12f72706
 +F test/walfault.test 60527645638532a565a8e729db287ef0dba85ece
 +F test/walhook.test c934ac5219fee2b4e7653d291db9107b8dc73bba
 +F test/walmode.test c326079dd35481bbf1bbcf0f74a2d16463c97e49
  F test/walshared.test 985b4a3406b2b2dace1d52a42d26a11dd6900981
 -F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 -F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
 +F test/walslow.test 989854bc5c214700a9f2d545bb158643813b8881
 +F test/walthread.test e6e32e93ccebfa401dfc0dd930c79daa3472b0ae
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 3bf8006d441b66a57bee02bb420423f84eb8fde3
@@@ -851,14 -849,14 +854,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 5e2ee7db0f7a2a042b182336438107e2248d7b88 acb171d4cfef2fec8833f761019f5c81f0d138a0
- R 947bd4c119b9d5f55074dc6610886e81
 -P 21a1e5961bba148fda50cc0b7d472ca74f90808a
 -R aa9cc30f9dbcb7ea427137065cf4e4be
++P 866e9286ae4226b2bec40ef18c672a41768abf1f 42537b60566f288167f1b5864a5435986838e3a3
++R b90ef642aae0ac30fb7a61a1e0be0fdb
  U drh
- Z 964ffe986640ee03584034c0fbd63d28
 -Z e73ee740c6593b4458c2d23b6fa7b923
++Z 1c471b938c17ff72270ce2f43edc1fcc
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFMaygtoxKgR168RlERAh8BAJ0Sc7lcQ318/YZu4lIkJpwUbxBirgCgiK/F
- nDAJI3FVvDVZNT4ltJLHPkQ=
- =ltft
 -iD8DBQFMcsNUoxKgR168RlERApyRAKCOHvk0Gn1uE2F8YVm3k/w13/3UugCeOh16
 -bApiXjM1a7FP+Qr1HX5kWTQ=
 -=L2Lf
++iD4DBQFMcxuaoxKgR168RlERAh66AJ9x4GdYxXfsFSw+a46wDFbYJj088ACYkCd4
++vS4UiZumt45mBBT+i5zWwA==
++=aiSb
  -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 116ede08d0e57745e5b063dd3f8ea17112354274,7f0f695ba62651f7e05da0923df9e7a3a6b6e2a6..eaf6e39d76ce324a3094d26b05e26638858b8bff
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 866e9286ae4226b2bec40ef18c672a41768abf1f
 -42537b60566f288167f1b5864a5435986838e3a3
++415c448dc45a297bd1b0bbce25c4572eeab286f0

diff --cc src/pager.c
Simple merge

diff --cc test/pagerfault.test
Simple merge

diff --cc test/wal.test
Simple merge