Merge recent enhancements from trunk.

FossilOrigin-Name: 76373091354f27577e5235e96cfaa4b31429a38d1e0e1d6e094c4cc323b92a0a

diff --cc manifest
index bc08e70fd1915df08c48bbdacf9b46a4fbe681fe,da68400145a40214a0d9a9114e491425f371357f..c8a3a065d338c2d5104963c07c2c1707f04eccea
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Grammar\schanges:\s\sthe\ssclp\snon-terminal\sshould\salways\sbe\sfollowed\sby\sa\sscanpt.
- D 2017-12-24T17:01:54.828
 -C Enhance\sthe\sLemon\sparser\sgenerator\sso\sthat\sit\screates\sa\sfaster\sparser\sat\sthe\ncost\sof\sslightly\slarger\sparser\stables.\s\sAdd\sthe\sability\sto\smeasure\scoverage\nof\sthe\sgenerated\sstate\smachine\swhen\scompiling\swith\sthe\s-DYYCONVERGE\soption.\nIn\sSQLite,\sadd\sthe\sSQLITE_TESTCTRL_PARSER_COVERAGE\stest-control\sto\squery\sthe\nnew\sparser\scoverage\sfeature.
 -D 2017-12-27T18:19:06.642
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2017-12-27T19:27:26.668
  F Makefile.in ceb40bfcb30ebba8e1202b34c56ff7e13e112f9809e2381d99be32c2726058f5
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 6480671f7c129e61208d69492b3c71ce4310d49fceac83cfb17f1c081e242b69
@@@ -423,7 -423,7 +423,7 @@@ F src/btmutex.c 0e9ce2d56159b89b9bc8e19
  F src/btree.c b83a6b03f160528020bb965f0c3a40af5286cd4923c3870fd218177f03a120a7
  F src/btree.h 32ef5d3f25dc70ef1ee9cecf84a023c21378f06a57cd701d2e866e141b150f09
  F src/btreeInt.h 55b702efce17e5d1941865464227d3802cfc9c7c832fac81d4c94dced47a71fc
- F src/build.c d3d2feeeee9c6b41a0bc7a00e4803724780f29f27ef16633b6e32aa0901c7994
 -F src/build.c 6ab114a9a4717622df3745d26f2c55e9113f356441a8f76fa2b1d7e1f2472c20
++F src/build.c 972224edcc3385f1d6ad265f84a8120f777a2c4f7405ad848def0aee082a9573
  F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c ff1be3eed7bdd75aaca61ca8dc848f7c9f850ef2fb9cb56f2734e922a098f9c0
@@@ -479,11 -479,11 +479,11 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c 8b22abe193e4d8243befa2038e4ae2405802fed1c446e5e502d11f652e09ba74
- F src/shell.c.in 339169a3d1307b5566ebe9ce15832d03439206106724c78cc3d9125a7b851795
- F src/sqlite.h.in 2126192945019d4cdce335cb236b440a05ec75c93e4cd94c9c6d6e7fcc654cc4
+ F src/shell.c.in f3ec8f90dd698ea98781a90642c91eacbc24f4e55bb551c7b2762000d3ef55dc
+ F src/sqlite.h.in b4dc75265ed04b98e2184011a7dd0054ce2137ff84867a6be8b4f3bdfbc03d30
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
- F src/sqliteInt.h 124be5e9bacd2a356ba17875bbaddf5f25aa1ba8a292233210ba8141ecc58316
 -F src/sqliteInt.h 26bf7cc7aaa6a6eb3d3c0581f9ef5523da01babb8de1d796793d5165fea95958
++F src/sqliteInt.h d7054a71c87fe6b21c42147d4857f5baa8f19e959003b6011e473a1f5f93a542
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1687,7 -1687,8 +1687,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P c4951833c2b976223c2393d82fd2606068c71cd19612ca9df4e26debab980e32
- R bc2b2a8774f331c7775262d09dd60c38
 -P fd2e0e7a770c2ce9355068aad1024c3d2861c104fd3be304a91c55ca742155fa ec9b19eb652e81cd3c8a5595eb39aac3aca4abe72136c4b65c9cc257594a9c92
 -R 0e64cfa85d322f92630985625ab9cde3
 -T +closed ec9b19eb652e81cd3c8a5595eb39aac3aca4abe72136c4b65c9cc257594a9c92
++P 74a0181fc016fb0b7934188cfcc2ec26c689f0d33cc42453875f4392b7240d3a 1b22b42e59793af19c69a2e5f6822883cc2687d4a0d9b9280bbff885276c6baa
++R a3246aa6793f9a1aed1e1936973e7f16
  U drh
- Z a70d3a97910b6c52f1408e750f661b18
 -Z 2c8c57db844de473726a040b30aceb6b
++Z 2e8cea4c20132476e571ae504e9351f9

diff --cc manifest.uuid
index b5e2fe7f2b3858c7cc02f48192a3a15c1c318492,0ece256edabdd8d5f68b556de860ab7fd442a8cb..c3e1771bba4ff952602734e739909d6d77bc2f02
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 74a0181fc016fb0b7934188cfcc2ec26c689f0d33cc42453875f4392b7240d3a
 -1b22b42e59793af19c69a2e5f6822883cc2687d4a0d9b9280bbff885276c6baa
++76373091354f27577e5235e96cfaa4b31429a38d1e0e1d6e094c4cc323b92a0a

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge