Merge updates from trunk.

FossilOrigin-Name: fca799f03ad04b7d36381108ff10e9c7d03656ac

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 3f096864ca79ea7df6ffc19920081824179ef031,cc548c623274aceb23731db465091ecf0b0a5b21..c66fa87bac5de019f5f7dc25d25c95226e3aa4c4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Environment\svariable\snames\sin\snmake\smust\sbe\sin\sall\suppercase.
- D 2013-07-11T03:09:45.896
 -C Add\stest\scases\sto\scover\sTPC-H\sQ8.
 -D 2013-09-11T14:57:11.714
++C Merge\supdates\sfrom\strunk.
++D 2013-09-12T00:40:54.982
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1b432129f87a6a4258f9b9e01ba5ccda0b19851a
 -F Makefile.msc a97163524522cd829cb91bcf900d07608e025502
++F Makefile.msc 9af063716f726a73b5d5c98c69ea97eca6a9369b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
+ F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -1034,21 -1050,23 +1050,23 @@@ F test/where3.test d28c51f257e60be30f74
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
- F test/where7.test 5c566388f0cc318b0032ce860f4ac5548e3c265a
- F test/where8.test d6a283eb7348a8967d44e2a753f117ab0d21d4f3
+ F test/where7.test 5a4b0abc207d71da4deecd734ad8579e8dd40aa8
+ F test/where8.test 6f95896633cf2d307b5263145b942b7d33e837c6
  F test/where8m.test da346596e19d54f0aba35ebade032a7c47d79739
- F test/where9.test 1b4387c6eacc9a32b28b4d837c27f857c785d0d8
- F test/whereA.test 24c234263c8fe358f079d5e57d884fb569d2da0a
+ F test/where9.test 4f3eab951353a3ae164befc521c777dfa903e46c
+ F test/whereA.test 4d253178d135ec46d1671e440cd8f2b916aa6e6b
  F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
- F test/whereC.test 13ff5ec0dba407c0e0c075980c75b3275a6774e5
- F test/whereD.test 3f3ee93825c94804f1fc91eef2de0d365981759a
- F test/whereE.test 7bd34945797efef15819368479bacc34215e4e1d
- F test/whereF.test a0e296643cabe5278379bc1a0aa158cf3c54a1c9
+ F test/whereC.test d6f4ecd4fa2d9429681a5b22a25d2bda8e86ab8a
+ F test/whereD.test 6c2feb79ef1f68381b07f39017fe5f9b96da8d62
+ F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
+ F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
  F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
+ F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
+ F test/win32longpath.test e2aafc07e6990fe86c69be22a3d1a0e210cd329b
  F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
  F test/zerodamage.test 209d7ed441f44cc5299e4ebffbef06fd5aabfefd
 -F tool/build-all-msvc.bat c55f64ca200308fb5fa5c1ee751ea95a13977b5a x
 +F tool/build-all-msvc.bat 38623a30fd58288fda5cc7f7df2682aaab75c9d5 x
  F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
  F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
  F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@@ -1064,10 -1082,10 +1082,10 @@@ F tool/mkkeywordhash.c bb52064aa614e142
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
- F tool/mksqlite3c.tcl a61fe62a2895ca6458c463fccf1211ca1c000fcf
+ F tool/mksqlite3c.tcl d344cc3144a0271cd853c5e3df36e9f31d78d619
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
 -F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9
 +F tool/mkvsix.tcl f3312df26fd9938a27fa0a845ec96bea84b0c16b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1092,8 -1110,9 +1110,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/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
 -P 48ed8b565b84c8fa7898c2f9817c01f7e9c9182e
 -R b9522deba37561644e51654b6b510026
 -U drh
 -Z 8b5488a345e69fd6a7996d8b2149a33e
+ F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
- P 7a8b0e362b529d54231453046f22e90e651ecdc5
- R ff249db1b0f16f46ad7ee4ebeeb16b40
 +F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- Z 80027817d1c05a21c407e2d8f86e9a15
++P 0328e873f2f98ac0aed93ec07ba7e14228cc10e0 eb5cef8351d12c0f8550dac96ee7a6e495975b5a
++R bbec8abb81b8cd0c7571dbf35d2c5c81
 +U mistachkin
++Z f30a72b760cda2efe97653c1108abdf4

diff --cc manifest.uuid
index aaeecb4f34f1be3a7854a6cc8b624c4956d45585,d5a16fdb234b3557a0bec74d21df965f727ed26e..4b607ea2f795194edef331a2812d05d9678506f7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0328e873f2f98ac0aed93ec07ba7e14228cc10e0
 -eb5cef8351d12c0f8550dac96ee7a6e495975b5a
++fca799f03ad04b7d36381108ff10e9c7d03656ac