Merge fixes from trunk.

FossilOrigin-Name: 002406df22995880d002be2e4cebb4d560283d4e0d7a4b5a34edcb110802b543

diff --cc manifest
index 860c76daf4beca79e86378f7211949ec95890e60,8e0a0698d79cfc325d49812529687f0c6916679c..15f785bf63c7539c8cb7fd258f0460aa62251426
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2020-01-02T23:50:50.904
 -C Remove\san\sover-zealous\sALWAYS()\smacro\sand\sadd\sa\stest\scase\sthat\sshows\sthat\nthe\sconditional\scan\ssometimes\sbe\sfalse.
 -D 2020-01-03T14:34:04.183
++C Merge\sfixes\sfrom\strunk.
++D 2020-01-03T15:22:54.803
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -526,14 -526,14 +526,14 @@@ F src/pragma.h ec3b31eac9b1df040f1cc8cb
  F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 241c32d6be93e72572f23e3dd1160036db377fa0707fcb04b69e4d1a034c5fe9
 -F src/resolve.c 31dc20837034491e5a043f411425a507b306ceedf40d666af5fc87b13020ff3d
++F src/resolve.c 3868d75d4bbf8e7d3c78b9cd9c8ec5b483d004cf671a35ee2f18e5ed907d4bde
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c 8791103f21df458fdaba16c7d6452f92b00363f222f0f242661654f12455ea0a
+ F src/select.c 64bf450dc0f2b37be8d2be6ff7d25a70de37ef6fb64527c68f767fe9fe47bc55
 -F src/shell.c.in 90b002bf0054399cbbfac62dd752a9b05770427ba141bcba75eefbb0098f4280
 -F src/sqlite.h.in 51f69c62ba3e980aca1e39badcaf9ad13f008774fe1bb8e7f57e3e456c656670
 +F src/shell.c.in 69462c95793d69a16df93deabbd6d026f5f6ef6c87d9da54ed1477c03490d17b
 +F src/sqlite.h.in efaecabd038dc30282f243af087c4960e528d0df25a05f90f988435fec5ef779
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2
- F src/sqliteInt.h 03a952654df3b9a94fbe34a2cbeb73a3a613689fa2a61307a4709a68628ee16b
 -F src/sqliteInt.h a694b38db1748007390cbafcaba56d5379203c23ab5ae7d3a538f367e8638102
++F src/sqliteInt.h a45a681d64b1f86e8baac511d81e7ac11825efb929081ae75601391a9e4e2e7d
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1853,7 -1853,7 +1853,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 96a2db2612f2e47bbec0e374a242820c88f03c42ccbf8467abccaef41469bae2 51665bf0f975fb248964a4be205a4f3285d3f3f8cc697977d264efefbbe20dd8
- R 8c7e397d4bcba49889cbfedd58b7bb0e
 -P 9d791116420f4e3f613775569e0a0cba2fc22da568b2fb2df920bcf9c9002938
 -R 95579694e6c940cfce958a36249eabe6
++P 091403a6705f5f1352c76eacbfdca75fe0bab12ab9b156842641de07c38d3f66 536e9a9d1bd514056ecbc8172ed58f2656a86f791a15e526ae2e5f2c93687b6a
++R 9513c96f193ce58d39e33f5bdd19fac1
  U drh
- Z 091b61bd8246d8cb46dad6a652b4937a
 -Z 7a1e3b4d114838baf5b8097e8c4ad0d7
++Z 07648178e3cddd9499b97db1756ee9dd

diff --cc manifest.uuid
index ec0780186015a106575a35abe83c74e160f26675,cac5ef7bc0353ed5eec64e5a2ad2350073a5d731..a5bfac2f65e7a85160f312c4d2f3cfbc275ddbd6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 091403a6705f5f1352c76eacbfdca75fe0bab12ab9b156842641de07c38d3f66
 -536e9a9d1bd514056ecbc8172ed58f2656a86f791a15e526ae2e5f2c93687b6a
++002406df22995880d002be2e4cebb4d560283d4e0d7a4b5a34edcb110802b543

diff --cc src/resolve.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge