Merge enhancements from trunk.

FossilOrigin-Name: d192d737755876293a2914fcb9a0d5efbe07f3cd281c038666ea5aa879c06321

diff --cc manifest
index 05c247a4ec1b69d04de9aaccfdbdeeedccca23da,160e3c1b1fc335f44210dc35d93d8f8cd166b7b7..5f911a3705f8560ef16bee40362e783d85e09c61
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improved\slabeling\sof\sEXPLAIN\sQUERY\sPLAN\soutput.\s\sMany\stest\sfailures\sdue\sto\nthe\sdifferent\soutput\sformat.
- D 2021-03-19T13:00:28.477
 -C In\sthe\swholenumber\svirtual\stable,\sincrease\sthe\scost\spenalty\sfor\srunning\nopen-loop.\s\sThis\sappears\sto\sfix\sthe\sproblem\sreported\sby\n[https://sqlite.org/forum/forumpost/b52a020ce4|forum\spost\sb52a020ce4].
 -D 2021-03-19T17:54:43.183
++C Merge\senhancements\sfrom\strunk.
++D 2021-03-19T19:09:24.666
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -503,7 -503,7 +503,7 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 0f893f734487729a9d48a0335dcbb541f1e479e7f048d996e3a0b9dc69d427a2
 -F src/insert.c 9b2a2cf53ef800d85f9068a29d5ed8a0e97f230f69670a13e7682c646194a06b
++F src/insert.c b73e6ca39a1ff5bbdb36fbc1600e922fad8e69e1a34e6eea947e18f1aa8bf838
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
  F src/main.c 2a7ece3a67c646e5fe9984ffe0277d6a76f80ce9715bf2faa591d8cb66b9d913
@@@ -542,7 -542,7 +542,7 @@@ F src/printf.c 59c2222594b692bbf323b44e
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c dd47248c2c914feb0d4428c27d782e2723971d32cfa5536f49306d080df4d45a
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c f8ef9023982ebbc3bfa47b96590aa03d944d8766038ce5970d6762ff9949248b
 -F src/select.c 734cf12e42f81f2fe461e41214e6552375e55b62a802784a4f0066ac592e7f4a
++F src/select.c 5095a9f76ed7a1e15796a813e3f616b539a9f16c5d3c963bcbe869c545ffd493
  F src/shell.c.in 8df3912a7ca4873a1443d4adef1b25baee8c086ab479fd9c4f13ab03f98049ab
  F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@@ -606,9 -606,9 +606,9 @@@ F src/test_windirent.h 90dfbe95442c9762
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c c64c49d7c2ec4490c2fef1f24350167ba16b03b0c6cee58ad1a1d70a4325d4e9
+ F src/tokenize.c 0b9c82fa628b5adce93e2bcaf935a24d43eb83344fb51551f7835526d0693fc4
  F src/treeview.c c6260e1fa5f41c361b2409edc9b0050bcaef5bc4d6abc467fbc45f0d7ccf3d84
 -F src/trigger.c 861c3ec2c5b0fc830bdf82470454a9324fad70cbaa96d2e208fb54577c9e8d28
 +F src/trigger.c f555123aabf7f3d175cbe6d33c02783302cbdc0a7236203fa2a0539baf2d890e
  F src/update.c 0f5a61f0787199983530a33f6fffe4f52742f35fcdf6ccfad1078b1a8bc17723
  F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@@ -1910,10 -1910,7 +1910,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 114d9780aecdd9f03f235fc1f2ab81ef89cb00b3bafa61cff612e939595ff5f0
- R 710195bef3f0d2c17fb0c771d4c8fb88
- T *branch * eqp-improvements
- T *sym-eqp-improvements *
- T -sym-trunk *
 -P 959272c27555e39f180d46257afe45d41da1f5df38ea269196c06741ff6a278e
 -R 51ac7d994705198c73d6f6e97c1c36d1
++P 6f8faec0222a7ca07cc1a5ed16cc08d92c6e20bbcb34851b4eff9e624de53601 f12b54042e27b2fe99f23f97c103ee4371f8d4df3b049d9bb5d64891db56eee5
++R b1c29a6e3125d2bf75454721444d7112
  U drh
- Z c0a2560796cb72b7c4ee37f12bd1d09c
 -Z 90da41d95168d1eeb1398c4f34c1c25f
++Z e489e4a1a305f57f100d2d980cdadf52

diff --cc manifest.uuid
index aae708644ed226744fb760b3e16adcf5ffc2e3f5,6133448c4360b28e62d1d15adaf52829db9f0d76..f97cdf851fdfc179f87ef9cd5c3d5e52fdad6856
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6f8faec0222a7ca07cc1a5ed16cc08d92c6e20bbcb34851b4eff9e624de53601
 -f12b54042e27b2fe99f23f97c103ee4371f8d4df3b049d9bb5d64891db56eee5
++d192d737755876293a2914fcb9a0d5efbe07f3cd281c038666ea5aa879c06321

diff --cc src/insert.c
Simple merge

diff --cc src/select.c
index d172e2da7ed6a472243b2cfef14620b26acfc489,e2fa051e59462545129085720894431401b3b1a4..3dd944d9cdbadaf41295608be7761dfaee10974c
--- 1/src/select.c
--- 2/src/select.c
+++ b/src/select.c
@@@ -6410,10 -6412,10 +6412,10 @@@ int sqlite3Select
        pItem->pTab->nRowLogEst = pSub->nSelectRow;
        if( onceAddr ) sqlite3VdbeJumpHere(v, onceAddr);
        retAddr = sqlite3VdbeAddOp1(v, OP_Return, pItem->regReturn);
 -      VdbeComment((v, "end %s", pItem->pTab->zName));
 +      VdbeComment((v, "end %!S", pItem));
        sqlite3VdbeChangeP1(v, topAddr, retAddr);
        sqlite3ClearTempRegCache(pParse);
-       if( pItem->fg.isCte ){
+       if( pItem->fg.isCte && pItem->fg.isCorrelated==0 ){
          CteUse *pCteUse = pItem->u2.pCteUse;
          pCteUse->addrM9e = pItem->addrFillSub;
          pCteUse->regRtn = pItem->regReturn;