Merge updates from trunk.

FossilOrigin-Name: a88b5be01e68b26267ff6eb05e931ef2e7fc9f99

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 91afd84b3cd8b444cf96cb599be3be86ffe3feed,dc0e75d8d8a0a773ccdde018f2d4c9b7e67879cc..5a14be7003c7673dee63386fe730e680a3375ca4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
 -C Restore\sthe\sindex_list\spragma\sback\sto\sits\sformer\soperation.\s\sCreate\sa\snew\nPRAGMA\sstats\sused\sto\saccess\sthe\stable\sand\sindex\swidths\sand\sheights.
 -D 2013-10-12T20:22:00.025
 +C Merge\supdates\sfrom\strunk.
- D 2013-09-24T19:07:48.655
++D 2013-10-12T23:39:49.890
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
+ F Makefile.in e2d28ec95bd17ab4f3b6ee40b7102e9d7a0857b9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc ef17891ca710b1e7bc9cbab2061381884362aeb3
 -F Makefile.msc a08b5f4ed4f760bae4eae4e723371487c5378983
++F Makefile.msc d72be28ba13ec3986ac5791a6549036a84dc5903
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
@@@ -170,12 -171,12 +171,12 @@@ F src/build.c 8ae900bf021a66ac110f5eb2d
  F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
- F src/date.c 65196e95e69f36993659bd7781abe7c2f1994739
- F src/delete.c 2dc64ca360b7d7da481183ea920a813a0c203c97
- F src/expr.c 1017f482217e093ecdaca91e8666681e83733252
+ F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
+ F src/delete.c 45788c5e48734f2af4acd75a876466e5b9838e34
+ F src/expr.c e7338ccffdc391c53ba2d51c5eb6a2f5299e040e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c be866cd8c4fa6cae98ba33109578fd1a3311ee5b
+ F src/fkey.c 5dc10cbaa355753903cd2a64da040f948997ebf8
 -F src/func.c 2c47b65e6e00e3e9374942f28254faf8adafe398
 +F src/func.c 5fb4103cc5fd2920696e0a263e6a56a2844ab35d
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -559,12 -564,11 +564,12 @@@ F test/fts4merge2.test 5faa558d1b672f82
  F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7
  F test/fts4merge4.test c19c85ca1faa7b6d536832b49c12e1867235f584
  F test/fts4noti.test aed33ba44808852dcb24bf70fa132e7bf530f057
- F test/fts4unicode.test ebd937061e1ce096240d2352feb424587f2187b9
+ F test/fts4unicode.test e28ba1a14181e709dcdf47455f207adf14c7cfe0
  F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
- F test/func.test cd25cf605c5a345d038dc7b84232204c6a901c84
+ F test/func.test c7e80a44eebac8604397eb2ad83d0d5d9d541237
  F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
- F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
+ F test/func3.test dbccee9133cfef1473c59ec07b5f0262b9d72f9a
 +F test/func4.test 142490571f2e7ee6c3c5a65f24cad3f8342c02a2
  F test/fuzz-oss1.test 4912e528ec9cf2f42134456933659d371c9e0d74
  F test/fuzz.test 77fd50afc12847af50fcf1941679d90adebadde6
  F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
@@@ -1112,10 -1121,9 +1122,9 @@@ F tool/symbols.sh fec58532668296d7c7dc4
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
+ F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 8922be1a3e0269552e12b87fe1e5141c38a8d3f8 ed24051462c09220ebfb82a347b4a2b5c820ef63
- R 4d2894e447b5c39e0b9e2bc56076987a
 -P 27001356ed8201529b3f31d4313f2010f1b4e1b1
 -R f3adfc8132b3f36843e2e67728415fbc
 -U drh
 -Z d16ae1a1de8f3334074e16125e33c2b1
++P 435ce3b3fc0cffb4d7e6f2694c3100066e19f9ed f0cf8c85dcbcc7778aed2816792c368d777f79cb
++R 891b0b68c6f6fe8752068d950723fcad
 +U mistachkin
- Z 7dee757dc233dca1626329d37ad8fbdb
++Z f69b0089d66b59d2f7fc2c4b7bcb9bb1

diff --cc manifest.uuid
index 1e728ca034747ba6d06fa49a0e0504e9785f39ee,6559ca61a5aa74dd70b8c56f32ac48ffae14075d..f6786d82a389602984ba2bbb88e26c7f525d3146
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 435ce3b3fc0cffb4d7e6f2694c3100066e19f9ed
 -f0cf8c85dcbcc7778aed2816792c368d777f79cb
++a88b5be01e68b26267ff6eb05e931ef2e7fc9f99