Merge the latest trunk changes into the stat3-trunk branch.

FossilOrigin-Name: 11ca4ed8bf850dae1a24b7182f70039f32bd8dd1

diff --cc manifest
index 9eaa287209ca7a2217c94d2b1854b4c17cde01c6,f5503e1304d32dda2f1cd6365f5ef15eaaed84fb..7c536462160dbe55778bc14f61c38bfe2efc8b6b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sthe\sstat3-enhancement\sbranch\swith\strunk,\sbut\skeep\sthe\sresulting\smerge\nin\sa\sseparate\sbranch\sfor\snow.
- D 2011-08-26T13:16:33.563
 -C Cleanup\spdb/ilk\sfiles\sgenerated\sby\sthe\sMSVC\smakefile.
 -D 2011-09-11T10:14:37.609
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sstat3-trunk\sbranch.
++D 2011-09-13T19:09:28.865
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
+ F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 55fe94bf23b4c1ff035f19b0ae2ea486350f8d01
- F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
+ F Makefile.msc 25da409ce0c7799e57f48a729a8e153b23027adc
+ F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -124,16 -124,16 +124,16 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c ed13fdefdbe671d5777773dcfb3a162ddb4623ae
- F src/btree.h 9ddf04226eac592d4cc3709c5a8b33b2351ff5f7
+ F src/btree.c 4cb13cf019d1978b62494b970d20e9555211094b
+ F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c ea854c9d5e86098c721574e7c0fda3552227f54f
 -F src/build.c 851e81f26a75abbb98bd99a7c5f10e8670d867bb
++F src/build.c 57e3b27c26e6754393cd63a2774a6c673df1e804
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 3e961190276d1a48c5224e9558253f8e1f31bf50
 -F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d
++F src/ctime.c dde6a9b835b9e8cc067b713de1a7f6a0c9ff807e
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
  F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
- F src/expr.c 4bbdfaf66bc614be9254ce0c26a17429067a3e07
+ F src/expr.c cbcd8c2f1588a9862291a081699854c5e1cb28ab
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
  F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
@@@ -179,11 -179,11 +179,11 @@@ F src/printf.c 585a36b6a963df832cfb6950
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d
+ F src/select.c bf7b7ea6befb483619da5f597b0864668b828c3c
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
 -F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 +F src/sqlite.h.in 3f531daa04457e83bc13765c98c06c7d71c27fa5
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 6dedc0587dff7dede458000557ac8fc5fbedf5aa
 -F src/sqliteInt.h c7e37ee49b1a922ddcd18fa98dd750efa4d2db14
++F src/sqliteInt.h b7f41c29477dfa18b18c0aa3e9230c7a4c775de2
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -235,17 -235,17 +235,17 @@@ 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/vdbe.c 4a7191c0f8e918b74e8c84cbdd77746d6b7e3bcf
- F src/vdbe.h 2bf6ec77d8b9980fc19da6e0b0a36d0dbf884ce4
- F src/vdbeInt.h f9250326f264ca5f100acc19e9c07096bb889096
+ F src/vdbe.c 7008edbf8f608d82c035dcb1c56367ad85e68aaa
+ F src/vdbe.h a10b360bf69474babc8aba8fcc64b824c5e97d38
+ F src/vdbeInt.h 693d6ac6810298fc6b4c503cfbe3f99a240f40af
  F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
- F src/vdbeaux.c 1bd0fbeadede0c07d78e25008db61bc90ac3e412
 -F src/vdbeaux.c 079d37d4afac8359b2bbbf4af9876be04cc857b8
++F src/vdbeaux.c 316409c6878363525a2835aab15e0505c951a16d
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
- F src/vdbemem.c 74410d1639869b309d6fe1e8cbc02a557157a7c2
- F src/vdbesort.c 8a61a6d731cbe612217edf9eece6197f37c9489e
 -F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9
++F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
+ F src/vdbesort.c 667bc65254a9ebaf7bc466ebb7e58884933e351f
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
  F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
@@@ -960,13 -958,10 +960,10 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
- F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
+ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 -F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
 -P d0712dfb24867a807c9cddcc12bd0aebe1d3e085
 -R 2d6c3f1bb7ceef0c7739aec15017d5b3
 -U mistachkin
 -Z a47fc06d3051baa0866b54de99b831cd
 +F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 1dada5158215d1816edb69ff2610f9d2259ce19d eaf447ea87b0ff29ae06283204f522fcd005b284
- R eae2c984d609130c06d9d7e2a5d61977
- T *branch * stat3-trunk
- T *sym-stat3-trunk *
- T -sym-trunk *
++P 63f2c7859fa6e5d0e2cdd218ff52a3ec2d44c61d a9db247b752bcda0131b8f01c6f0182f3101d154
++R 2e9e259494c37eae338f4a7f0467a2a7
 +U drh
- Z cd6356200476d143c6be69191b0e280a
++Z 16b18ce61af4e2a2021001a6e69294e0

diff --cc manifest.uuid
index 55b7b89a872c46c28a720e1f0173980c8eb1ff56,74ab610c51eb17cffa31c07ebb81136d1e0b92ed..48802d32a8d32fb07375ef490c78025c55581538
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 63f2c7859fa6e5d0e2cdd218ff52a3ec2d44c61d
 -a9db247b752bcda0131b8f01c6f0182f3101d154
++11ca4ed8bf850dae1a24b7182f70039f32bd8dd1

diff --cc src/build.c
Simple merge

diff --cc src/ctime.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbemem.c
Simple merge