From: drh <>
Date: Wed, 19 Jul 2023 10:17:42 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the sqlite3_stmt_explain branch.
X-Git-Tag: version-3.43.0~99^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47079b19dfae85cba60a5c976d258b4ce6405d6c;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the sqlite3_stmt_explain branch.

FossilOrigin-Name: 06eae046c1a1155f22590b88942db72f01482f2363da9753f8adfdb322679055
---

47079b19dfae85cba60a5c976d258b4ce6405d6c
diff --cc manifest
index 0926a795e7,575934e4e2..059255339d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enhance\sthe\ssqlite3_stmt_explain()\sinterface\sso\sthat\savoids\sunnecessary\nreprepare\soperations.
- D 2023-07-18T17:29:05.187
 -C Two\sminor\simprovements\sto\ssum(),\sone\sof\swhich\swas\sinspired\sby\n[forum:/forumpost/af5be98dbc|forum\spost\saf5be98dbc].
 -D 2023-07-19T09:52:10.467
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\ssqlite3_stmt_explain\sbranch.
++D 2023-07-19T10:17:42.983
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2043,8 -2043,8 +2043,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 5683743ddf0bb051f2fe5d137cc18407e000e77e9faa9010a22e3134b575638b
- R a56fcd1282b166331b87ac37d0175ebe
 -P 76152ad2ffe56034f2fd93d9a1ce9358e1677a7e9cd3dcd9f3a34a5c956a463e
 -R 47d8d8ca9ec8151ad0210262a08ac711
++P 050f773addd605f6690348c98e9000a9a3663bbc26288a71973fd7b40468e8ab a0d3e7571aded8d1e03908059d2d5aa5d62ec49bff099cb38f6f35df5e4b18b5
++R 1b8abd8c868c9252b4ad39501c74d63b
  U drh
- Z 96b7009f78463b1b25a8594262247cfd
 -Z b98de7129167c58b9385610fbdec3119
++Z 5952a3e3d009df0b224f122b62ef2345
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index ab125fc443,4a5750f1d2..24e5dc90bc
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 050f773addd605f6690348c98e9000a9a3663bbc26288a71973fd7b40468e8ab
 -a0d3e7571aded8d1e03908059d2d5aa5d62ec49bff099cb38f6f35df5e4b18b5
++06eae046c1a1155f22590b88942db72f01482f2363da9753f8adfdb322679055