Merge trunk enhancements into the json-in-core branch.

FossilOrigin-Name: ea755771699dcbffe0ddfd204d42fae9b6e79e107485c725b8eb6caab92aacb8

diff --cc manifest
index d04f8b0c46912cb7a13bd1efd6459023dc2d22e2,a1c90a1f9a00725d974b661c66eb8fd6733368bf..e36c760a795484cd051ed817540a8ac666189074
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sa\snew\sbuilt-in\ssubtype()\sfunction.
- D 2022-01-09T16:54:02.203
 -C Add\sNEVER()\smacros\sto\stwo\sbranches\sthat\sbecame\sunreachable\sdue\sto\n[e199a851e316bd47].
 -D 2022-01-08T21:50:00.551
++C Merge\strunk\senhancements\sinto\sthe\sjson-in-core\sbranch.
++D 2022-01-09T19:36:39.850
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -494,10 -494,10 +494,10 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c 0e9f84f974e970fb373c15caa1624a281b3c33098cb9dd9021d6801c04eb4fde
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
- F src/build.c 6e16f7b539bfc55149a039bf0cda26b089640339df6147070b072df2d1c4f771
+ F src/build.c c72407a27a28982a384cd453a3a6b6992a1ceae8bd8d95e96d7fb9c0d645a32f
 -F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
 +F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
 +F src/ctime.c b09ce320b78718d5e0c4a7a59b8705abe8ee4683d9fa4b33768fe347e1b2a42a
  F src/date.c ab8e01d928f201f5dee0bc6d54d6702fdcec96dff4d58c387447671f6a46d191
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
@@@ -505,7 -505,7 +505,7 @@@ F src/delete.c 19814f621cde10b1771a0dea
  F src/expr.c 827179c78d2ca7cc318392811de8151c60eacf7ce804b13e61bb7ef38f954846
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 5b73f7a7c00f06017531a5bd258cbc2c7a294e55a7f84a729fe27aa525242560
- F src/func.c 76a9ac772f67be5af9476e02ae0866f4919d1981f97ff16dedfe37a1c62cbf8e
 -F src/func.c bd0feae5c5b1680773930f07604474329e543f63502cb1e0fb127823c2a817da
++F src/func.c 8fddc42bce95d17938252a543f86fe29e479366e80fbd112a1822913b6247776
  F src/global.c 1f56aead86e8a18c4415638f5e6c4d0a0550427f4b3f5d065ba5164cc09c22e8
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@@ -538,9 -537,9 +538,9 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c f5ad51cfd024116db8531feab9efd831c2621436dca1464e4ff1e8af9bf3252e
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 55a9a8c745c47a49e6541b1d634f6152e3f72f76c6dbb04fe24413986a928091
+ F src/pager.c 5130bd602719ad9de1436def895da73973ee74382db02036be21238d0aa2ccfd
  F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 -F src/parse.y 761b5d30a7ea9bd2db3b3571438cfcceb5f7dbf4fcad6881c8de65bdda07135a
 +F src/parse.y 04f61db1cdd7036c6d74baad1c342d3e3110cb0765c48fcfd3bdf4e974a1e5bb
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
@@@ -1938,8 -1937,8 +1938,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e116501c2f0e594eb7a3dd804daa943cc508f32ded3078aed21b695ec83bcd4c
- R 28e65f1e2d788c0c1b31d4dbdc4f0a91
 -P 68bffc612c467b2419bf5fe85a8ca16b787003e0e8c11f7c051a879f5865b847
 -R c94d976a37a2f277f5140b8791189b0b
++P a25f4ce255c034fc694c33728aedb98289ebccda9c48920829ef780b92b8faee 71272caff5874137ad0b1ddfc22ced4bb66e6c97f7868fdae0347a186f589b38
++R 49fcbfca4503349519b1d6e2c92f7acf
  U drh
- Z fde45050a7eb088af98952ef4d939a27
 -Z 7446237fb7eda07b8f82330a10b1e8d5
++Z 4bb2ffcd67d474872b040ea5d2948b38
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 7d48848f7ba9263ac86705cfcbf2ec85b46051d6,36029f2538ed3b10c166b16ac194d0396d380c8a..f20238fd7cfbd046d8c7a4b40425d213d6e0af86
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a25f4ce255c034fc694c33728aedb98289ebccda9c48920829ef780b92b8faee
 -71272caff5874137ad0b1ddfc22ced4bb66e6c97f7868fdae0347a186f589b38
++ea755771699dcbffe0ddfd204d42fae9b6e79e107485c725b8eb6caab92aacb8

diff --cc src/func.c
Simple merge