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

FossilOrigin-Name: 4fa9ee794713e7a2298f53d9b517c90745b3408b

diff --cc manifest
index 70b8ffa4b1a4cda4a4e9ae3ef904f01ef4685fa4,1a5584b29b2461d24fc52ad57e873404c309daf9..2dd020a60d9941441b1529b3e2d49a0777f175dc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2011-10-21T17:18:20.228
 -C Fix\sa\stypo\sin\sa\scomment.\s\sNo\scode\schanges.
 -D 2011-10-31T12:25:01.056
++C Pull\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-10-31T14:42:31.165
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 +F Makefile.in acb1a0b8fe8029196afe437f64ead3301731b6f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
@@@ -121,19 -119,19 +122,19 @@@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5
- F src/analyze.c 682fd999a01c897a682365a459190758b83de836
+ F src/analyze.c 5a1db16a651ce6310c8b046b2cbb736e030e14b9
  F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 -F src/backup.c 4368158da74d4711888e03264105c5c527d76caf
 +F src/backup.c 096853864aeb7b2b8c6fc7ec346d845eac16566a
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c 32199e2d939233ade25340eaba450f818b37c079
 +F src/btree.c 601b808e1f1e7d0d17270f6103c5759633f5f76f
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c ae152efb9c2d6615b14adb7a5f2c51483d4d55df
+ F src/build.c 8af67a08a852ff4c63701963cb1ab7166f577814
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 829f3261d3db48e3d87891bc887208734734c2e4
+ F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
  F src/expr.c fbf116f90cabc917ae50bba24a73a0b55519a0c8
@@@ -182,12 -180,11 +183,12 @@@ F src/printf.c 03104cbff6959ff45df69dc9
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 -F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
 +F src/select.c 8d0e30602418d112db04c4c2d2cf20fd9580e8b9
  F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
- F src/sqlite.h.in 039d3179818e30759ba3bdf1edb2676ae1977539
 -F src/sqlite.h.in ff950aef7b378963c67add42dda5d446a0b7330e
++F src/sqlite.h.in 016de67059ae3b00963e927c675404903eba8a01
 +F src/sqlite3_private.h e3b586e0aa329075d99be7198df9bc80c5b19e2d
- F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 4e8c351ec27343a9c69c8bf91731b91e3ad10a62
+ F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h c74457cd2c4bd77683bac76e698bf2ec2d3e13f9
++F src/sqliteInt.h 65a6ba854a1b0167cdcbd0c5096602fe899da08c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -203,9 -200,9 +204,9 @@@ F src/test8.c 99f70341d6ec480313775127f
  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 0056646e54ccd0b816b710a58d2095b3440c2cb9
 -F src/test_config.c bc8826296a7b3a86eeaba1ac2af5551d1c20c35b
++F src/test_config.c 6912d4d1b398c69dfbb5eaa50595d31d89653086
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -242,20 -239,20 +243,20 @@@ F src/update.c 25e046a8f69d5e557aabde20
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c df83983bd57057df4951516880066b42b7055269
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c 2ed980c8b2e560ab0e50bdcaa8f3333c4dd763ae
 -F src/vdbe.c 326994a64a9a08853122200dc9f62cb96b8f0831
++F src/vdbe.c cefc9d9bbb9487a8d519de6dce11f8bc7cfbb406
  F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
- F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
- F src/vdbeapi.c 335435e65443f38d3073b5043e80cbbb7090c2d9
- F src/vdbeaux.c a76f50a538fb9c6e90d8648fbdb154179f58bad6
+ F src/vdbeInt.h 9498fc98a2c9e349a4ef13455ff5a3e898f40176
 -F src/vdbeapi.c 4dbba7f94f127f6ea8d2d0505ee1f98e5ffbf546
 -F src/vdbeaux.c a950e34449a508d48d90475acc287943a4094f3a
++F src/vdbeapi.c a78a20bff2bb976aef5b9965d4f6ecedfcc2d586
++F src/vdbeaux.c dfe420bef5028dd41b3efb890d8b757dbe4b94b9
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  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/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
 -F src/wal.c 9658df8d404b82e6b2d40fd05944463214e2d935
 -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 +F src/wal.c ae9272089ec7bd1b5dba6eeb6909ff018e40632e
 +F src/wal.h e75d87752bd5df3dc4152ee2cb3b0dcd0b309e5e
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 922145a39cf91a5dbb83bbc54f0e316f52023fa2
+ F src/where.c 7c85f4c93058e27100d404f0777aaeb0d1b296ae
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -397,8 -393,9 +397,9 @@@ F test/enc2.test 796c59832e2b9a52842f38
  F test/enc3.test 90683ad0e6ea587b9d5542ca93568af9a9858c40
  F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
  F test/eqp.test f14fadd76da53405e9885e2431cacf7191d83cdb
+ F test/errmsg.test 3bb606db9d040cc6854459f8f5e5a2bcd9b7fd2a
  F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 -F test/exclusive.test a1b324cb21834a490cd052d409d34789cfef57cb
 +F test/exclusive.test bd8976a6e67daf8e9948eb1c6a27afafe79752fa
  F test/exclusive2.test 372be98f6de44dd78734e364b7b626ea211761a6
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
@@@ -562,15 -560,14 +564,15 @@@ F test/lock.test db74fdf5a73bad29ab3d86
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
 -F test/lock5.test 5ad6a1f536036ff1be915cfdd41481aeafda3273
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test 71d0ba9cd23212b5ce1a433107c806203fa6d5f9
 +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 39c4bb8a157f57298ed1659d6df89d9f35aaf2c8
 +F test/main.test 3991157c720c2b2b9ec27254d940f06ab81aab84
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test 8c727fe29fccd280cbf8f6acf08bd10b76beaf34
+ F test/malloc.test bc745155ff4252d4f35ec8316625b0dfe2abc659
  F test/malloc3.test de8eca0c3e748878845fdca3663ec4b642073caf
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
  F test/malloc5.test 30dc30b57fa22552eba0d8c95210d96c3d958a39
@@@ -977,7 -974,7 +979,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 9efb74cefb2b7444112e16f3da48d5645746fdfa 76de9914bed11abda3898928633ad09d5a284f84
- R ff59b75f665561c9ffd57ff590889162
 -P 13a9d085e1a5654a97b8d26bae7182ca6c0c237b
 -R b059ff356abfc5b4524a9b548916f43e
++P be62ef058bcee55b31127ee779f7ecbf762986f8 6635cd9a7714b681dd8aa96e90be462a40d10178
++R 76b4ba48f5a469af1b620b90084fe1df
  U drh
- Z 7e41e2920fb5c9764f219e8a7543321b
 -Z 96e807ea22060094cd672e7fd9baae6e
++Z 5999e74c5857ddb82230fad4eb996c52

diff --cc manifest.uuid
index 2110f71e26edb17162d71dc8a14a40c5069386ce,445a58c5ee884ee9da99bebe10e412e8a9c0708a..f6f83b0ab4ee031b369e5995af13df0cdc4cc98a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- be62ef058bcee55b31127ee779f7ecbf762986f8
 -6635cd9a7714b681dd8aa96e90be462a40d10178
++4fa9ee794713e7a2298f53d9b517c90745b3408b

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge