Update this branch with latest trunk changes.

FossilOrigin-Name: 3ccd64eff7ded6d7e918baa3ba096a34d1298040

diff --cc manifest
index f6388cef2105715b5c9f18f483086223675f1457,2022595ba26778f832a5c0a60033822a475da593..9776ba1307873ca427c134425ad7424575cb74c1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Set\sthe\sOPFLAG_SEEKRESULT\scorrectly\sin\s"INSERT\sINTO\s...\sSELECT"\sstatements.
- D 2015-03-23T14:39:19.308
 -C Suppress\sa\scompiler\swarning\sthat\swas\sappearing\swith\sSQLITE_THREADSAFE=0.
 -D 2015-03-24T18:19:39.691
++C Update\sthis\sbranch\swith\slatest\strunk\schanges.
++D 2015-03-24T19:43:19.645
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -231,13 -231,13 +231,13 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
- F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
- F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
+ F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e
+ F src/sqlite.h.in 2f9606a682af372415ce9d1f244183c5cc8385aa
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h b536f3d79fd2ce71daac7fe618f8c919e705621a
 -F src/sqliteInt.h bedf15914c09bfb5fe3ec4e3f211a4a6fc42cd33
++F src/sqliteInt.h c622684344dd0f008ba5198342426aacec36d9f2
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
  F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
@@@ -287,17 -287,17 +287,17 @@@ F src/test_vfs.c b7e6831e6fcf04c5090acc
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c 05e52378c46efbc1fd63cbbbf7f3c555f840f4bf
+ F src/tokenize.c a8d270b06e5f709930f7b67cf70a847969cb5bf3
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c 250cefb96cfc7ca8f86f92ecf6b6b6c7e289daf7
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c 9976deedc3f702d61a63da6d7b4da4eacbf0afd8
 -F src/vdbe.c bbfede5a8a6908b3ddcd55fdb0b2301288dd4754
++F src/vdbe.c 5cb31321523c4723a70f965c996feedf89e24c1f
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
- F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
+ F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
- F src/vdbeaux.c 23390670e64f011f3fed8f38a2f25aaccacb74d2
+ F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
  F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
@@@ -1247,7 -1246,7 +1247,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 93e28ea1ef41f274c5685f3bbb93a4d9ad44c880
- R 1bdebd59fc5ce3db34d12811b57c9be3
 -P cbeb9a1aed8ce3fb569a7717ad03c7c058b68de6
 -R 1df40f85f677c47017b13b63b82a97b5
 -U drh
 -Z 408df2ac27dc537c38335d50565b918f
++P 6f7d9995855bb5ae6dfe75c08a532b26808988b3 436314b5728c9413f9ac2d837e1c19364f31be72
++R fb9135ff0648c32a795a5ec1d3342822
 +U dan
- Z 351e859f90f619b0b703977dae1c4d34
++Z 1d28000cf48ee9729ff8277fca616b7d

diff --cc manifest.uuid
index cdaf407bd12b92e36ea7c45a0d8455b45ded27c2,b639b7d8cc31ea7e4ea5e61a8d7b52b19fa86e6b..ffc561c64e1b6aec26ae24e0258a25c8ddb55b30
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6f7d9995855bb5ae6dfe75c08a532b26808988b3
 -436314b5728c9413f9ac2d837e1c19364f31be72
++3ccd64eff7ded6d7e918baa3ba096a34d1298040

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge