Merge fixes from trunk.

FossilOrigin-Name: 9c471195f6d3e4b00e2d0f909b306a4036352082dca5f016a8eece226e82163d

diff --cc manifest
index 06e42be717424ce31114783943f4f11f944e5e10,2135fb477d5d1bfa91db179db686f33cca950a1b..448d34a0ee626d488374274defb9990d20cc2017
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Reduce\sthe\ssize\sof\sExprList\sto\s24-bytes\sper\sentry,\sdown\sfrom\s32-bytes\sper\nentry.\s\sThis\shelps\skeep\slookaside\sallocations\sin\sthe\smini-size.
- D 2019-12-13T01:12:21.115
 -C Ensure\sthat\sthere\sis\sa\scontaining\sSELECT\sstatement\swhen\sprocessing\sa\nnormal\saggregate\sfunction\sas\sif\sit\swere\sa\swindow\sfunction.
 -D 2019-12-13T11:42:56.220
++C Merge\sfixes\sfrom\strunk.
++D 2019-12-13T12:14:23.880
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -525,16 -525,16 +525,16 @@@ F src/pragma.h ec3b31eac9b1df040f1cc8cb
  F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 347c0624f83451803530668055665f770afa851a35a09cb429a7a4749c61706f
 -F src/resolve.c 86a7773d2892227ba9ad1721c41bb03c501830f1bf6de5f78dd0062b82e10c9d
++F src/resolve.c da68e9e68e60aa786a4a7b67c6e3ca2b8186df1ed1830ba230c94889aa8ac15f
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 -F src/select.c 0fe10579de20eb8dc04ec9ed29659fa782bee2bcc85a35734637f3e2cabc2762
 +F src/select.c 3590f0641817f0d3af4211315ff91abd197f7c03ba8d20129388af8dcdb707f3
  F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817ded
  F src/sqlite.h.in 2a23e8161775253d9cf383c2c6aa559005dc787d350dcb0be67a6c4cc3bd1d19
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2
- F src/sqliteInt.h 344e090acc6491b86c4e4368dbac3b679ecf169be0675f567c6e72e71895cadf
 -F src/sqliteInt.h 60d92fad64da7c3e77bbc35ee306340814cdaa5df32892b0ec58d306d99b5733
++F src/sqliteInt.h a036ca4ee94ac0dea82c90b2c902dc84bce187adf75e68284e890bc0c4cd3d95
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 -F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 +F src/status.c 0fe55b92810509eac821ded2e177e1da944a78cdcdfec7813ad1d6b36d6d667e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
  F src/tclsqlite.c 8cd2600e8de23dff6cdf84d39f46ca57139b061b28f6f80b166bace17d52ab1c
  F src/test1.c c654981c1d86ebc90dd23fcc0969e6c85e28112f0acc2e2224a97a2a33e7c42f
@@@ -1852,7 -1852,7 +1852,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 e392e7f22861ce4b66e4bf84b59c8fd38568fc241a699e001f47fd82011f4d28 59d0f3afe5249a2a6453fe7bc810c2c7beb896d3800174c7c90f9304c0b1ad88
- R e3ff512e1397b6f86c243712e8e279ca
 -P e5dc2939d3e8694d648fc9b73b1174da5b1349e20fbb9cf1c91268939f308f89
 -R e59b82d06383bd505b8273cd5ef0d82d
++P bda92d92bf69a73bc6dd498f92578ad6e81111a3f97bc8724d1720e7283a83b6 c1014e80b26131200a115beb86929a8f0ded2dd65b075e47373346c0f170576a
++R b2be5daabe2de4420861c8338271e7de
  U drh
- Z 3ffe0d20b28fddd879606871dbd0d175
 -Z 2895c09312f8773411c5f3c256e1384f
++Z 5e37344191b5a16624379099587382f5

diff --cc manifest.uuid
index 1f4e273627a128e7cc4eac07090f10efc6d78332,179d24fa6607abf1cf1b134f1324704bf2672c83..69d04cf3efcf35aa8e03b5575d15e919ec7e3a2e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bda92d92bf69a73bc6dd498f92578ad6e81111a3f97bc8724d1720e7283a83b6
 -c1014e80b26131200a115beb86929a8f0ded2dd65b075e47373346c0f170576a
++9c471195f6d3e4b00e2d0f909b306a4036352082dca5f016a8eece226e82163d

diff --cc src/resolve.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge