Merge updates from trunk.

FossilOrigin-Name: 8922be1a3e0269552e12b87fe1e5141c38a8d3f8

diff --cc manifest
index ea4e76fd565002353688ea92f9fa03dc4d8f7adf,91047af1817fa0dd98086b83988738ac190869c5..d61ee006e2afb04a47b411553207a4b93cf7c358
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sability\sto\sgenerate\sassembly\slisting\sfiles\susing\sthe\sMSVC\smakefile.
- D 2013-09-06T21:41:11.484
 -C Combine\sthe\sFuncDef.iPrefEnc\sand\sFuncDef.flags\sfields\sinto\sa\ssingle\nnew\sFuncDef.funcFlags\sfield.
 -D 2013-09-06T13:10:12.385
++C Merge\supdates\sfrom\strunk.
++D 2013-09-06T22:27:55.935
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -171,11 -171,11 +171,11 @@@ F src/callback.c f99a8957ba2adf369645fa
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
- F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8
+ F src/delete.c 2dc64ca360b7d7da481183ea920a813a0c203c97
+ F src/expr.c 33ae44812d25799000dbcfd54bb2142b30cdd049
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
- F src/func.c 1f24db7b0f19e28170ffa5d5887b842e4d9a48d9
+ F src/fkey.c be866cd8c4fa6cae98ba33109578fd1a3311ee5b
 -F src/func.c 7650d35651bb0ca903d24f4e5e944bfdaac9f152
++F src/func.c 8eed739f11acd20fb89a82bf0ad60f75b0a8f907
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -1110,7 -1111,7 +1112,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 94c4cdc50d2753c859e494d53cebd09edd2e5663
- R 6b551c6dae3914b271288c70374acb57
 -P a99a53b81e29c9514b85318bea028d1667e5f760
 -R 8c10a6011eb52c6098e833ca515e6c77
 -U drh
 -Z c7e49c79214a66374f550dcdb7a70012
++P 6caa2cd10421a85db6740fb2ae8a42b573959562 97b10e66e98e84755aa577f8da017bf1aea2056c
++R 10ba881e2c7b774138e3a52c0d93d6d1
 +U mistachkin
- Z c5c612cbd00cecdaa9ef5d871289b004
++Z d4c0acc5b28a494c6ee6d9515debd6eb

diff --cc manifest.uuid
index aec120a35d48f03d30f54f73034ed926beb5bc42,dbc304a49113dcc0595f6db7e67df81fb58075b9..3928ea3cb285bcbc20e708dfdce12c86dbc9ea19
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6caa2cd10421a85db6740fb2ae8a42b573959562
 -97b10e66e98e84755aa577f8da017bf1aea2056c
++8922be1a3e0269552e12b87fe1e5141c38a8d3f8

diff --cc src/func.c
Simple merge