Merge updates from trunk.

FossilOrigin-Name: 2383aa2cb864734cccca6c98605df6026c732cbfb9a173660d2993dc63970f63

diff --cc manifest
index 300b1315239cae5ad3fc9cbe9cee88b66ef61bf9,0b9f10ff839f200dc428958457c8d922a92f32de..f94cf41a14ba2686ca73e9bc646b9090a59d2402
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Back\sout\sthe\ssqlite3_stmt_mode()\sand\sEXPLAIN\sTABLES\senhancements,\sbut\skeep\nthe\sother\smiscellaneous\simprovements\sto\sEXPLAIN\sthat\swere\simplemented\swhile\nadding\sthe\sabove:\s\sTurn\smagic\snumbers\sinto\ssymbolic\sconstants.\nAdd\sthe\ssqlite3MemPrint()\sinterface\saccessible\sto\sthe\sdebugger.\s\sImprove\nthe\sperformance\sand\sreduce\sthe\scode\ssize.
- D 2020-03-21T03:40:21.764
 -C Recompute\sthe\sset\sof\scolumns\sused\sfor\seach\stable\swhen\sthe\stable\sis\ninvolved\sin\squery\sflattening.
 -D 2020-03-21T00:05:53.338
++C Merge\supdates\sfrom\strunk.
++D 2020-03-21T14:05:56.197
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -529,14 -529,14 +529,14 @@@ F src/pragma.h 9473160d220416456b40f273
  F src/prepare.c 8d4d6c8aa6afefc48027c54b41cdf134b4d6bc2fc4badbe483ad7fd9e1728a28
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 -F src/resolve.c 38e3a5636f5bdc92e3683e4cafbba6418c0aa15e0d89ca5b28bd0b621dbb80bf
 +F src/resolve.c ad43b2ed4bea58abca3092993382aa2ac91b89144d2066faae4ac924b39396f9
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 128d9d6996eca5e0db686495559b6588f197ef1b6643fa8ec4914861226ff021
 -F src/select.c cb7588bfe9e1a900801e5ca345296b32b85ded0d57b2f277a9962294eb4c7aa2
++F src/select.c ba6d286edbf0dcb0c9b90ad6b8020d7f2e0b21fb2f19d33d5972db831756b2c1
  F src/shell.c.in f76590931c0cbbfef347f44f81ade6b335f80c46bc6e59b8b6114383a8df30e0
  F src/sqlite.h.in 802957feeb249ede54f8dfe99b72aa19e70a0b7737969c46e625dc2f9f2d42b0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 9c5269260409eb3275324ccace6a13a96f4ad330c708415f70ca6097901ff4ee
- F src/sqliteInt.h f2cef459c6c2394084bc794eb2b79eb15684c351162191ed368e73523dea91ac
 -F src/sqliteInt.h 3ccd2aedc57f61009285c4fa7ca1d75b380a48b5168f9605c10c86a7be62156c
++F src/sqliteInt.h 84e11419a13b8d20b9dd91eb5c5547cdb905f0c0b658f70669dae07843c35356
  F src/sqliteLimit.h 95cb8479ca459496d9c1c6a9f76b38aee12203a56ce1092fe13e50ae2454c032
  F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -616,10 -616,10 +616,10 @@@ F src/vtab.c 7b704a90515a239c6cdba6a66b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 697424314e40d99f93f548c7bfa526c10e87f4bdf64d5a76a96b999dd7133ebc
  F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
- F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
+ F src/walker.c 7c429c694abd12413a5c17aec9f47cfe9eba6807e6b0a32df883e8e3a14835ed
  F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
  F src/whereInt.h 6b874aa15f94e43a2cec1080be64d955b04deeafeac90ffb5d6975c0d511be3c
 -F src/wherecode.c 7b939de85d65cc4b4bfa197513136b9e0ae03167e3b82842ca5a0ba1055ba65d
 +F src/wherecode.c 9e931b9d01c3c6ffa9b150f4535dacea0dd38360fa740b6f525cf27c17415ba0
  F src/whereexpr.c 264d58971eaf8256eb5b0917bcd7fc7a1f1109fdda183a8382308a1b18a2dce7
  F src/window.c ba1ffb78d73c5831433681aab7ee634230ee32f14ad508efa585044662141d5a
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -1860,10 -1860,7 +1860,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 e7343ce7514f61eb1aeba22ab83da5b05779080db394332e2e90b4d54cabe123
- R b39cb192f1a90aeded8f742f9e8ca7a0
- T *branch * explain-improvements
- T *sym-explain-improvements *
- T -sym-sqlite3_stmt_mode *
 -P 86e98ddc19470410ccc6d2cf4ad56ef0bc5a23b7fbe6331b8cae374689f54529
 -R ee0c3203501becfb0c0fab4a61c04589
++P 62aece66774587590bf7f88883cca1c1e76866e9df93bb1a17c4d9db894f06aa a9bb71ba708ba72255ba8d18c9856e38ddf53eae2d61c8435149354fb2b2459e
++R d7e5eecaf46db6237774ccab2e4497bb
  U drh
- Z bb6144a2aea448bb5177f4cac3139da9
 -Z 54b4f622fc0ff39925380e9e68d902eb
++Z d68a3bb48f89136a3b7a1e13c312fa0b

diff --cc manifest.uuid
index fa08dcedf53c18eeea1bbb66f1d64ce170d7945e,9db2ae6f1cad0175e62fb26b25f0a7d2f525fe10..b16bbcb0c22861c2f4ba3933933d1465efc2402c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 62aece66774587590bf7f88883cca1c1e76866e9df93bb1a17c4d9db894f06aa
 -a9bb71ba708ba72255ba8d18c9856e38ddf53eae2d61c8435149354fb2b2459e
++2383aa2cb864734cccca6c98605df6026c732cbfb9a173660d2993dc63970f63

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge