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

FossilOrigin-Name: 4c69e827f4d65e597e125e0d6691b0c8fb5588d7

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 5ffbe46c6da86780cf5fc01e217362ed43873096,bc116c5db39d339930958868a2574a4b1c39385b..5920d3a684d7a50011421d717979fffceb2d0e9c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges,\sincluding\sthe\sread-only\sshared\smemory\nenhancement,\sinto\sthe\sapple-osx\sbranch.
- D 2011-06-02T13:07:43.593
 -C Fix\sa\sproblem\swhere\sFTS\stest\scode\swas\snot\sbeing\sincluded\sin\sthe\stestfixture\sbuild\swhen\sSQLITE_ENABLE_FTS4\swas\sdefined.
 -D 2011-06-20T11:15:06.397
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-06-20T11:57:58.568
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in a38f09acc876beec6b103a6e12a33795c6b1df9c
 -F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
++F Makefile.in 8410b02448997eb43bdf0ffa482c9bc2d2624e45
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
+ F Makefile.msc ce73810c83d4bd202deb59d547a5df4a5cfef7c9
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 3fcdd7fbe3eb282df3978fe77288544543767961
@@@ -100,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 3c7e0f21e531b58cfe398964a464411543462eec
 -F main.mk 6de0d92dcae3d399a6bafaeb23b57f6ef0f41955
++F main.mk fffabd0d16174b622792e26f6caf6e661f388a1c
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -136,21 -135,21 +138,21 @@@ F src/date.c 1548fdac51377e4e7833251de8
  F src/delete.c cecc926c70783452f3e8eb452c728291ce1a0b21
  F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
- F src/func.c c02fda657f2366c493198c3e480695fc69972c5f
+ F src/fkey.c 9fabba17a4d4778dc660f0cb9d781fc86d7b9d41
 -F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
++F src/func.c 1b9d471b632d8529e0f86b7bd2b918dcc2cb1097
  F src/global.c 29bfb85611dd816b04f10fba0ca910366e128d38
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 3eea5a53d2644116fb865afaa4699fabe62b441c
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
- F src/main.c 1b6edc1d61b466bb273dad8af31e3919aa750726
 -F src/main.c d67ea48933e4d63abba00578224a3319e6fbcbe1
++F src/main.c 42f2493a1662a2dee5ac56a05b05c0c545ae6d92
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 +F src/mem1.c 46095d62b241466ef51970e592aa3a7a87e443e1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -173,24 -172,23 +175,24 @@@ F src/pager.h 3f8c783de1d4706b40b1ac15b
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
- F src/pcache1.c d548e31beafa792d1994b663a29a5303569efc4e
- F src/pragma.c 8756649386a4eb7192915fb44e177d30e19f723c
+ F src/pcache1.c 912bd5687d6df344698d8e69560f347b6e21c18a
 -F src/pragma.c ebcd20f1e654f5cb3aeef864ed69c4697719fbaa
 -F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
++F src/pragma.c 2824f4c8f34fd917ba33948ae564ff947c1e6576
 +F src/prepare.c 9d7403fe75fefa134351b41400d09ba1b189134b
  F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
- F src/shell.c decd04236a7ef26be5ef46d4ea963044bfad9a48
+ F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1
  F src/sqlite.h.in 2f51e4f58b2b4626fcbd9938580e730cb5fb4985
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 6e58c558c57c8f44011736d5fa5295eb3130f9de
+ F src/sqliteInt.h 7b7ec2394b94fc4516930cd9dae37af0f9312215
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
+ F src/tclsqlite.c c124d55e3e7d156c0fcc62c7f9906de8451547dc
 -F src/test1.c efca486a25fb894988e7a82e84579a4e57388a02
 +F src/test1.c 5c8be86cba3ac703c765730b7dd1ec62bf84e750
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -234,17 -232,17 +236,17 @@@ F src/test_vfs.c e7855568dfa1e0ba73668d
  F src/test_vfstrace.c 0b884e06094a746da729119a2cabdc7aa790063d
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c 7b0c9281b2368dc69135e7a50bd271de9af1b467
- F src/trigger.c 144cc18bb701f3286484aae4292a9531f09278c8
- F src/update.c 5bcb56e5c7380a2eecb0e71891dbd4ad7437748f
- F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
+ F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
+ F src/trigger.c c836a6caac16ba96611558922106858f6ca3d6bf
+ F src/update.c 80d77311d91ebc06b27149e75701f1b3e9356622
+ F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c d671bedafc3b09fa3713427a8e3823d05f4d4560
- F src/vdbe.h d9c6123384189dc37d27beac1bf44688aa75b6cb
 -F src/vdbe.c 9eef9bb0d4a0de06cf904476eadf58395971e35a
++F src/vdbe.c 71a3e14a5dd6bafac3940c6eb446cd97dcbae34c
+ F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
  F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 0eeadc75e44a30efd996d6af6e7c5a2488e35be8
 +F src/vdbeapi.c d2ce598db7398acb82d65e99e7a917d5318dc702
- F src/vdbeaux.c 0505dc4f7ff3cf35e219fe0a20ab798a42772b8b
+ F src/vdbeaux.c 0b2e2880f13af400a27c92a7673287c3eaec8b21
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -549,15 -549,14 +553,15 @@@ F test/lock.test db74fdf5a73bad29ab3d86
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
 -F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test d0d313f059ae5661726d3f197ba6ed8f69257d8e
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
  F test/lock_common.tcl 0c270b121d40959fa2f3add382200c27045b3d95
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 -F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252
 +F test/main.test 753e2b772c041bd8dbd17c7e4132b3981378eaab
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test e56c9c3358da2c18385aea15a42dc970913986c2
+ F test/malloc.test 76017be66cec4375a4b4ea5c71245e27a9fe2d0b
  F test/malloc3.test 4128b1e6ffa506103b278ad97af89174f310c7ca
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
  F test/malloc5.test 4d16d1bb26d2deddd7c4f480deec341f9b2d0e22
@@@ -606,18 -605,18 +610,18 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
  F test/oserror.test 498d8337e9d15543eb7b004fef8594bf204ff43c
- F test/pager1.test 8baf4470b29511503abcaf1f17d16b16462e4d54
+ F test/pager1.test 228a831060dab96bc91b03ba2a85cedefd1ab38a
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
- F test/pagerfault.test bea066b9162e1ab6843c2c1524ebb0965715e956
 -F test/pagerfault.test 4194b8ea2a5da7958cd155556605ff554e1b065a
++F test/pagerfault.test b0a275779f0b0233809d2644dec94d689357e00a
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
  F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
- F test/permutations.test 5b2a4cb756ffb2407cb4743163668d1d769febb6
+ F test/permutations.test 1e8892ebf1bd6e9e8036f4841c72a91bf72da74a
 -F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 +F test/pragma.test 88048136eed6baa2097dd7ab5145d3288128ca70
  F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -693,10 -692,10 +697,10 @@@ F test/sysfault.test c79441d88d23696fbe
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl 51d761878d9934e19fc0eda3c9c5dbc39d02522d
 -F test/tester.tcl 76222602e59047c6ef119473c7a2ea7c6ee73d09
++F test/tester.tcl fa977567000000b49cbef700c07199df28fc7b8a
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -874,27 -873,27 +878,27 @@@ 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 5617ad308bfdb8a8885220d8a261a6096a8d7e57
 -F test/wal2.test aa0fb2314b3235be4503c06873e41ebfc0757782
 -F test/wal3.test 5c396cc22497244d627306f4c1d360167353f8dd
 -F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
 +F test/wal.test 3ff610479cd005117f54a8c003a8d86432e6f2ac
 +F test/wal2.test 24239bb8cd8ca5e47c9ab4ac705f7343d2f9b5a2
 +F test/wal3.test 34c65b1cb78e1da5d24c9ab74534c376784f96ea
 +F test/wal4.test 6a68c45bc1ca24a3592ec449ddcb92b29d0e0e87
  F test/wal5.test 1bbfaa316dc2a1d0d1fac3f4500c38a90055a41b
  F test/wal6.test 07aa31ca8892d0527f2c5c5a9a2a87aa421dfaa8
- F test/wal7.test 09bc8de3d11949571d6f7a4188b308059cec27e5
+ F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
  F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -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 58fce626359c9376fe35101b5c0f2df8040aa839
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 22ddccd073c817ac9ead62b88ac446e8dedc7d2c
 +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 7db81f3dac64ce8897196f199c2909078bcabf8d
 +F test/walhook.test c934ac5219fee2b4e7653d291db9107b8dc73bba
 +F test/walmode.test feb39956ec6f415fbb9dcb12d91243391c2c4715
  F test/walnoshm.test a074428046408f4eb5c6a00e09df8cc97ff93317
- F test/walro.test 1f15853383a976ff8bbec78dd44bc15c4e237392
+ F test/walro.test 2d5d69e2e99da19ce6faab340330234fc4ca0720
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 -F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
 +F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 +F test/walslow.test 989854bc5c214700a9f2d545bb158643813b8881
 +F test/walthread.test e6e32e93ccebfa401dfc0dd930c79daa3472b0ae
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 8e1175c7ef710c70502858fc4fb08d784b3620b9
@@@ -919,8 -919,8 +924,8 @@@ F tool/lempar.c 01ca97f87610d1dac6d8cd9
  F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c.tcl 98afd75c54489dd27b505fca45e3cc6943cb2409
- F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
 -F tool/mksqlite3c.tcl b23027b185d3e7c7a1803c6f977f68bebd7bc3ec
++F tool/mksqlite3c.tcl 1db8ff5115862cd926234afafe15da2adc8544c5
+ F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
  F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
  F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -943,8 -943,10 +948,10 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
+ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 8d1a6bb002a7817fa7df932f7cab7220c1d62c0e 19084a6641f77a62110b04ea50e298fe132ea784
- R 91418976bd0d542b6389cdb5161ed7c0
+ F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
 -P d138b0e65953c529619d64e662bdb5478d7d79c3
 -R 3d60296c03d3d0e2521fbba8cb89cf3f
 -U dan
 -Z 36fbe60e74554514c6ed759d1d5c5a4c
++P ce5f95dee6989f17a6a7af89699a02f8c5c6f787 e539d08a4dda073dc67dc39a104f89374d3bd8e9
++R fc5e80466e6b0dc7c5d050e3640a2348
 +U drh
- Z d68a47cfe5a3ecc44fdc07077d49f5db
++Z e118c565ba7861eece38b3234e70a076

diff --cc manifest.uuid
index ed00324915f7bd4e550a8c98d92ddbb251e6bc88,9a1cc9d18c436a5c6428c75facbd5c5ba1c931f6..6d381c1e2d5273abc7d66c3a23729ac1b31bb094
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ce5f95dee6989f17a6a7af89699a02f8c5c6f787
 -e539d08a4dda073dc67dc39a104f89374d3bd8e9
++4c69e827f4d65e597e125e0d6691b0c8fb5588d7

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/pagerfault.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge