Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: aa62d6881b5aae64e15dbae70ce8e77bcc2a9f0b

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 9d3769cfebb6f67a501e233de598de325b61ac45,f48746c07cb9628762d4788aa8789687d8ae2ed9..ca278dc6fef37497774ffeb369dac00b97703cf2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-08-15T16:21:55.837
 -C When\sthe\ssame\sindex\sis\sused\sfor\sall\sOR-terms\sin\sa\sWHERE\sclause,\sthen\stry\sto\nuse\sthat\sindex\sas\sa\scovering\sindex.
 -D 2012-08-24T23:56:19.679
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-08-25T01:21:36.221
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 49411436c99bf768dcd1cc749a52d7b071803e05
 -F Makefile.msc 45dd3579cae399d73e3f5eab36f6f332783072e5
++F Makefile.msc 938096d88105a3d102a04186cd5470a4e34a021d
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@@ -143,10 -131,10 +143,10 @@@ F src/callback.c 0cb4228cdcd827dcc5def9
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 500d019da966631ad957c37705642be87524463b
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 32041c65dc05a94914cf979fad7b82bc8a963fe9
- F src/expr.c e2927abf9c69ce4ff9a931bd201946961c34819a
 -F src/delete.c 335f36750dc6ac88d580aa36a6487459be9889de
++F src/delete.c 38f7517f76c61b971a51c91cc343e77897ef6a12
+ F src/expr.c 217840a107dcc1e5dbb57cea311daad04bedbb9a
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
+ F src/fkey.c 9c77d842dc9961d92a06a65abb80c64ef1750296
  F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
  F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
@@@ -157,10 -145,10 +157,10 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09
 +F src/main.c 1f15146d32b183d45fd0d41e8370a326c5d647ac
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
+ F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -186,18 -174,18 +186,18 @@@ F src/pragma.c 97f9357f0e7e5fb46a2519f1
  F src/prepare.c 33291b83cca285718048d219c67b8298501fa3a5
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
+ F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
+ F src/select.c a9d68e04f07348038ac279f3316ee8f8e146f59a
  F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
- F src/sqlite.h.in f0bc4a3e082cda4e52ce74e96dc47043ec3c3e9b
 -F src/sqlite.h.in f664797c68ced43c2ea2c541d4ec8e1e04ec68ac
++F src/sqlite.h.in 6bd48b850e66652823e0f0bdac857a3a3afbfb16
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 23284c2be677c1fb3c14051cd67427077825e8ee
 -F src/sqliteInt.h 497e89baddee92a4769cbc2c169b654a223f75d6
++F src/sqliteInt.h 15ae668e04d1f39aa40a45a14a33084435d984d7
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
 +F src/tclsqlite.c e4feb5698ee09f8b32ee40baa1d3577871125042
- F src/test1.c fc2acf0a2db517c8d19e5e55bda8e1237db77378
+ F src/test1.c 3d70f7c5987f186884cfebbfa7151a7d3d67d86e
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -210,7 -198,7 +210,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c aa0f42add3ea63920a8b7d1869be4c9b4106bdaa
 -F src/test_config.c 09781397ccc24268cb895be0d4c21b4aad651486
++F src/test_config.c 1ffddfdfa5a73e7fb497e8c89c22754bbc949c81
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
@@@ -245,7 -233,7 +245,7 @@@ F src/test_wholenumber.c 3d2b9ed1505c40
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
- F src/update.c 89de085a0bf4da448472029d0420a2b1cf1824ee
 -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
@@@ -1023,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 47f8f0711d63ef4166db9115db44b166959df14c 772d0de3f311f2035f8a42f01371c96c9fa587ce
- R e864d66a36e838c2faa41d39d7a05218
 -P d4cd6017c9875947a05b1dc36538d4272fb18739 b722143d075979ba3d92b7b29e576ce2307187d1
 -R d51bc6dccf316fa29f046fa529eea646
++P fc07a4795e027108674d1d41eb4350df629ddc8b 62678be3df35cdcb09172ba8c860f7b73517f1ea
++R 664d1e095b40f8d8d9f8fe9cfeed9474
  U drh
- Z abda2788c852df70f4e42cf73ff52089
 -Z 88e4cd6b2ce7efc36bc2db59aa6b0ac5
++Z 3f5ea055e7eaa711939d3a78f8dfab8c

diff --cc manifest.uuid
index ce7f8cd3c065155afb733456d99457525d724698,100c67b276c997f9c6adea44085952c3c7755e90..ea071dbcffc40408509aab3da4ea401dab44d910
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fc07a4795e027108674d1d41eb4350df629ddc8b
 -62678be3df35cdcb09172ba8c860f7b73517f1ea
++aa62d6881b5aae64e15dbae70ce8e77bcc2a9f0b

diff --cc src/delete.c
Simple merge

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/update.c
Simple merge