Merge the branch-3.28a fixes into branch-3.28.

FossilOrigin-Name: ba6bf331476d0217f4132b73cb3da559e75bfb21856ec94f82c0f0150a53592b

diff --cc manifest
index 494bccd522cb7a76062444381295ed7bd44a6412,c6c7ded21a7304a44840eb9ab1ab94b810cc177e..455ca1e2927acb482edcc3b1cb98ff7018439055
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\srounding\serror\scaused\sby\sscalar->logarithm->scalar\sconversion\swhen\susing\sstat4\sdata\sto\sestimate\ssome\srange\sscans.
- D 2022-08-09T20:22:01.525
 -C Remove\stwo\sincorrect\sassert()\sstatements\sfrom\sthe\slogic\sused\sto\sderive\ncolumn\snames\sand\stypes\sfrom\ssubqueries.\sThis\sallows\sthe\sSQL\sassociated\swith\sCVE-2020-13871\s(ticket\s[c8d3b9f0a750a529])\sto\sbe\stested.
 -D 2021-07-13T15:30:48.284
++C Merge\sthe\sbranch-3.28a\sfixes\sinto\sbranch-3.28.
++D 2022-08-10T17:03:43.321
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -523,7 -523,7 +523,7 @@@ F src/shell.c.in c1986496062f9dba4ed5b7
  F src/sqlite.h.in 59f5e145b8d7a915ca29c6bf4a1f00e3112c1605c9ac5c627c45060110332ba2
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
- F src/sqliteInt.h e19d89d6a1c24cded45b39f4bd9249c0222ded77681576675f91f035aca769c6
 -F src/sqliteInt.h 59e2f279aef255764d0778ee2741b05d6978167d8115135c26dfe3170a876937
++F src/sqliteInt.h 3d599ca87796deba6ebc5cab518262661c855ae31aa63eed0504223ec2339d13
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1819,9 -1819,8 +1819,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 263293f1e6db26039d94c9ed7efa2cdea25df5e5f42673a116ce2d03b9fadff4
- Q +86e30d7c4bb1cebe25b66686d6d1ee170c1a88e5a6c1bed6652ebbb024d62062
- R e66630f522d53c9737288eaeca403808
 -P 9e001b635f3cff672e591204ab90deefe01baaefe64ff121bd2c32edd2d03675
 -Q +712e47714863a8ed7ff73324d9fec569633e8b901c436c633b0220d16a7a9302
 -R 483f02b37ec5a253e775cb238ab2131a
 -U dan
 -Z 5d42ba6fb517de1ce0283fb5c64c9b26
++P 68d86f2b20ffa815f9f6bc1b402969ce76651a50e5b6f47daa8b6c8f5e696f52 d2e672203704aa18fdc652e9567eb29b71dae32e871f514308478a7a96025f29
++R 88ef982e5e56f20bd999e4280ab176a8
++T +closed d2e672203704aa18fdc652e9567eb29b71dae32e871f514308478a7a96025f29
 +U drh
- Z be09c684553cac509a2534656a541682
++Z ec095a6c54b68c4641d9afdfd01f70d2
 +# Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 355b2592de96ab8d7c21a6561c18898d12efbab5,ca246b5dc1d4b382918429f530ccc77907e7208a..8121bd1a686b77b5d28a7d9b56179fc66b3f2cb8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 68d86f2b20ffa815f9f6bc1b402969ce76651a50e5b6f47daa8b6c8f5e696f52
 -d2e672203704aa18fdc652e9567eb29b71dae32e871f514308478a7a96025f29
++ba6bf331476d0217f4132b73cb3da559e75bfb21856ec94f82c0f0150a53592b

diff --cc src/sqliteInt.h
Simple merge