Update with latest trunk changes.

FossilOrigin-Name: 87995dc9409482f0a7a367bfc51d78ac0f63b8c3

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index ca278dc6fef37497774ffeb369dac00b97703cf2,26d0c4d7e669f061e001508cb3bcb93099953ce4..e332fe6cdfb8489dcbb705561ea44b72f9bcf1b1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-08-25T01:21:36.221
 -C Changes\sfor\sERROR_PATH_NOT_FOUND\sin\saddition\sto\sERROR_FILE_NOT_FOUND\sin\s\nwinAccess().
 -D 2012-08-31T12:31:18.969
++C Update\swith\slatest\strunk\schanges.
++D 2012-08-31T14:23:16.346
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 938096d88105a3d102a04186cd5470a4e34a021d
 -F Makefile.msc f00ec5dc2e78eb63d32c3125ab7a999aa7fcf924
++F Makefile.msc f153aec9a398d04df7a6dbd4ec092bf3f8edcad3
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@@ -15,11 -15,11 +15,11 @@@ F art/sqlite370.jpg d512473dae7e378a67e
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
 -F configure e2d0e3b67d2b1b1049d389fd671275d79bb80457 x
 +F configure 4dd7d5fa033f649d7372e9ebd4aff68db6026da4 x
  F configure.ac 6e909664785b8184db2179013cd9d574f96ca3a3
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
- F doc/lemon.html 3091574143dd3415669b6745843ff8d011d33549
- F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e
+ F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
+ F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
  F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
  F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
  F ext/async/README.txt 0c541f418b14b415212264cbaaf51c924ec62e5b
@@@ -152,7 -140,7 +152,7 @@@ F src/global.c 4cfdca5cb0edd33c4d021bae
  F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 49dd0445a92aece7dea9f9b3018e479892b77a68
 -F src/insert.c b090d0a9fb9ff2dbdeaf66aedccf98cd13b1af60
++F src/insert.c 8c5a3aba0e97c39679de3b33f95e7795d336fc87
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
@@@ -187,12 -175,12 +187,12 @@@ F src/prepare.c 33291b83cca285718048d21
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
- F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c a9d68e04f07348038ac279f3316ee8f8e146f59a
- F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
- F src/sqlite.h.in 6bd48b850e66652823e0f0bdac857a3a3afbfb16
+ F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
+ F src/select.c f843c872a97baa1594c2cc3d4c003409a7bd03af
+ F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261
 -F src/sqlite.h.in c447d35212736c4c77d86bc2d00f6cf4d4c12131
++F src/sqlite.h.in 930b719ce295058817aa58e7b65c43dc668cc098
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 15ae668e04d1f39aa40a45a14a33084435d984d7
 -F src/sqliteInt.h 053e03a532beb909ead2df0721db67cdb4c48ae8
++F src/sqliteInt.h 569cb02b6555db22dbe38566ed904f40f0ae5eb8
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -244,17 -232,17 +244,17 @@@ F src/test_vfstrace.c f60e12754e65c0538
  F src/test_wholenumber.c 3d2b9ed1505c40ad5c5ca2ad16ae7a289d6cc251
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
- F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
+ F src/trigger.c 3f258307040173aff383eb23fb74c44fe829078c
 -F src/update.c 28d2d098b43a2c70dae399896ea8a02f622410ef
 +F src/update.c abb0fcabe551dae0a133fd2a4370b5a8c23b1831
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
- F src/vdbe.c 9a1c2f78ae8baba248c0369a2f7717a288c22205
 -F src/vdbe.c 9c524bded348fd0a53adc19f2d7cad76ba3442b2
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
 -F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 -F src/vdbeaux.c 9c293fd3040211687e83d5d27bef2382933146c2
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c b01b505ced376ee6a9310300c9cb1a0980731f94
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
 +F src/vdbeInt.h 3f5d994703b6d61032d48f3086329c960b1697e9
 +F src/vdbeapi.c 7d23764ea26c1fff2959e6a0984dd96de0fa8f75
- F src/vdbeaux.c 91923b781aa3db404fea7c7567617bf61a9a32d0
++F src/vdbeaux.c 797201e170a8bcc746d62aa82e2a280419b3839b
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
@@@ -655,7 -643,7 +655,7 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test b4f49af522304134d32966ccef8b00d2c4765664
 -F test/permutations.test 1a8ac849b659445a0b3883caf42fa2c2a289f4a1
++F test/permutations.test 02dd9f7fd2fc874d25572b9ae431181bd69a174f
  F test/pragma.test a62f73293b0f0d79b0c87f8dd32d46fe53b0bd17
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1026,7 -1013,7 +1026,7 @@@ F tool/vdbe-compress.tcl d70ea6d8a19e35
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P fc07a4795e027108674d1d41eb4350df629ddc8b 62678be3df35cdcb09172ba8c860f7b73517f1ea
- R 664d1e095b40f8d8d9f8fe9cfeed9474
 -P d3cf6832a59fe4c5723761abb4c89614406b03db
 -R 3b56b1cf438f03ed04a187d25a245ed3
--U drh
- Z 3f5ea055e7eaa711939d3a78f8dfab8c
 -Z 950f4ab8e7c8c7fcad5f5a96fb146fb0
++P aa62d6881b5aae64e15dbae70ce8e77bcc2a9f0b 527340abff18aedbcb0f82ac1296a9f548e24ac4
++R ce445dd99f7d73f4997bfaaffd71f58e
++U dan
++Z b7fa6fd6ef1ab9dd566a694a77a1f165

diff --cc manifest.uuid
index ea071dbcffc40408509aab3da4ea401dab44d910,526f75c90ce2acd644236758c5a942b2cf5a9550..56b257152ab290e692635040f1e45c3d407de287
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aa62d6881b5aae64e15dbae70ce8e77bcc2a9f0b
 -527340abff18aedbcb0f82ac1296a9f548e24ac4
++87995dc9409482f0a7a367bfc51d78ac0f63b8c3

diff --cc src/insert.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge