Merge trunk fixes into the unlikely-func branch.

FossilOrigin-Name: a51d751553b14aa26912c516f60727551deb8e60

diff --cc manifest
index 55164884ee08fd7a181c9195f5d887eb94487f51,11dfa9b55bd997fd4ca1e5095a46ee90df913f06..7a9888a7f680db66ce03c8250fe19309a851dcc4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Continuing\srefinements\sof\sthe\slogic\sto\stake\sWHERE\sclause\sterms\snot\sused\sfor\nindexing\sinto\saccount\swhen\scomputing\sthe\snumber\sof\soutput\srows\sfrom\seach\ntable.
- D 2013-09-07T00:29:06.736
 -C Deterministically\sinitialize\sthe\sPRNG\sused\sas\sa\stie-breaker\sin\sthe\sANALYZE\ncommand,\sso\sthat\sthe\sanalysis\sis\salways\sthe\ssame\sgiven\sthe\ssame\sdatabase.\nThis\ssimplifies\stesting.
 -D 2013-09-10T01:41:25.676
++C Merge\strunk\sfixes\sinto\sthe\sunlikely-func\sbranch.
++D 2013-09-10T01:53:18.529
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -290,7 -290,7 +290,7 @@@ F src/vtab.c 5a423b042eb1402ef77697d03d
  F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
- F src/where.c 613cfc35baebc4aa10b54c15e31745327b057232
 -F src/where.c b5d59b899b85aa03800905ecdc0a17565d51a6ab
++F src/where.c 05cf31505dd514d1e27075ae5ef23a23a3462231
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -308,7 -308,7 +308,7 @@@ F test/analyze5.test 765c4e284aa69ca172
  F test/analyze6.test 19151da2c4e918905d2081b74ac5c4d47fc850ab
  F test/analyze7.test bb1409afc9e8629e414387ef048b8e0e3e0bdc4f
  F test/analyze8.test 093d15c1c888eed5034304a98c992f7360130b88
- F test/analyze9.test e688c7289d3d33b7185e2c2afcac6a9f095563a3
 -F test/analyze9.test ed70f0c10502f6bcd6e1ec347edc3c0e114f4b53
++F test/analyze9.test a2c83301160d4d367d4cedfa503fc0b20556c723
  F test/analyzeA.test 1a5c40079894847976d983ca39c707aaa44b6944
  F test/analyzeB.test 8bf35ee0a548aea831bf56762cb8e7fdb1db083d
  F test/async.test 1d0e056ba1bb9729283a0f22718d3a25e82c277b
@@@ -1111,7 -1111,7 +1111,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 1a46a7242313da96420985fa52e1de3f84533e5b
- R eafbf9bd5dba867073722599ec249697
 -P d6e361d7fb8013d616af91ef2c10038c97d1be5f
 -R f0dc49c77588220f9d25d9d712edfe4a
++P b65dc53415f42d8402d0ec7f4bedf59d7b39b486 48ed8b565b84c8fa7898c2f9817c01f7e9c9182e
++R 57c422fa5d2c71518d0f8dca5acd5405
  U drh
- Z 0382b063215f6bbc8f334bae45df8ffd
 -Z e68c71d629e67be96bb05aa541d1ef71
++Z b21635cdf1a77e86e14dc5bd6f2adf83

diff --cc manifest.uuid
index 24110c517fa5155272f3bd208a6265285f81762f,b31980649d43c14b07282dfab1f970b645d563e5..d4288fff6f29767210e4cc2318497764ed5942cd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b65dc53415f42d8402d0ec7f4bedf59d7b39b486
 -48ed8b565b84c8fa7898c2f9817c01f7e9c9182e
++a51d751553b14aa26912c516f60727551deb8e60

diff --cc src/where.c
Simple merge

diff --cc test/analyze9.test
index 42bf3d5088ccdcb351c1201545f518561b7c57f1,250de200b73781e003b1f59506e7d67c737c3452..17ef36c475b865199100e5c9194d166915857e61
--- 1/test/analyze9.test
--- 2/test/analyze9.test
+++ b/test/analyze9.test
@@@ -805,9 -805,8 +805,9 @@@ do_test 16.1 
      ANALYZE;
    }
    set nByte2 [lindex [sqlite3_db_status db SCHEMA_USED 0] 1]
 +puts "$nByte $nByte2"
  
-   expr {$nByte2 > $nByte+950 && $nByte2 < $nByte+1050}
+   expr {$nByte2 > $nByte+900 && $nByte2 < $nByte+1050}
  } {1}
  
  #-------------------------------------------------------------------------