Merge updates from trunk.

FossilOrigin-Name: dd4b77c82af07bdcc92ed743f050e70887e5956e

diff --cc manifest
index 0c437e55e82a8ff29d8056af510d7d274a28eb9d,156319adc0f7f1dd8e2919a56c067b6f1faff9e4..abb3fa3f6d65b4b5eaee6515ff1267bc1c60cc08
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sin\sthe\slatest\schanges\sfrom\strunk.\s\sSimplify\sthe\simplementation\sof\sthe\ntointeger()\sand\storeal()\sfunctions.\s\sFix\stest\scases\sand\sput\sunambiguous\nlabels\son\sall\stestcase\snames.
- D 2013-06-21T19:29:33.743
 -C Add\s'queryplantest'\starget\sto\sthe\sMSVC\smakefile.
 -D 2013-07-20T00:34:31.920
++C Merge\supdates\sfrom\strunk.
++D 2013-07-20T00:39:33.362
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -171,10 -172,10 +172,10 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
- F src/expr.c ac9d259eea3123faa05fabe6dd8717696aca72b1
+ F src/expr.c 2b47ae9da6c9f34eff6736962ea2e102c6c4a755
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
+ F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
 -F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
 +F src/func.c 835168be942c8c18a6c6b3b78462bc378d25c7b4
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -553,10 -556,9 +556,10 @@@ F test/fts4merge4.test c19c85ca1faa7b6d
  F test/fts4noti.test aed33ba44808852dcb24bf70fa132e7bf530f057
  F test/fts4unicode.test c8ac44217bf6c17812b03eaafa6c06995ad304c2
  F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
- F test/func.test b0fc34fdc36897769651975a2b0a606312753643
+ F test/func.test cd25cf605c5a345d038dc7b84232204c6a901c84
  F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
  F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
 +F test/func4.test 0e2d0e295bc9093676c6e34ff6e33e2541417985
  F test/fuzz-oss1.test 4912e528ec9cf2f42134456933659d371c9e0d74
  F test/fuzz.test 77fd50afc12847af50fcf1941679d90adebadde6
  F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
@@@ -1094,8 -1101,9 +1102,9 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
+ F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P fa2a91e6c631864846484d13cffdc51856953cd1 096ae1d8f9a08f92daedece6b0615f4d22b05023
- R 6ba2737cc75280e9c7b2e803134db342
- U drh
- Z 3e127bc98d3edb650de7203bad06de46
 -P f755b4b21c885f3e897c2a79fc7ac1220210e653
 -R c94bb34849c12b79ab21d48a7e4bfef4
++P 9b837b0508fbfb395f0a0d8e4bd127730c80ffc5 ad0551e039ccaa9e7a28682b756b56ac2b8fef0d
++R 33b86cceed0735bd4a1923704e5dc6bd
+ U mistachkin
 -Z e904e41c59c0106f85082fb614ea3828
++Z e08a4ea21e3e4d1ffde87bd5e92d3d2f

diff --cc manifest.uuid
index d51919ca223f62873d7d7f86b624cbd0b07d3387,7a0ddc57b55e7a663bd7c4ddf087999ee0d7e946..3cdcdc5a78f2c5fab73a34c5c1a20e8546441198
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9b837b0508fbfb395f0a0d8e4bd127730c80ffc5
 -ad0551e039ccaa9e7a28682b756b56ac2b8fef0d
++dd4b77c82af07bdcc92ed743f050e70887e5956e