From: drh <>
Date: Tue, 20 Sep 2022 17:43:40 +0000 (+0000)
Subject: Merge the fuzzcheck fix from trunk into the flattener improvement branch.
X-Git-Tag: version-3.40.0~198^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5f8c42c988b5989fa278923af5c36167c57b900;p=thirdparty%2Fsqlite.git

Merge the fuzzcheck fix from trunk into the flattener improvement branch.

FossilOrigin-Name: 930a8c1561d0d5dc70dc5378edac77f79ac59ab6569b561de3dfb02f160c38c5
---

a5f8c42c988b5989fa278923af5c36167c57b900
diff --cc manifest
index 5d537c49f8,987d96a26b..e358a9d8ae
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Is\sthe\squery\sflattener\srestriction\s29\s(do\snot\sallow\sboth\sEP_InnerON\sand\nEP_OuterON\sconstraints\son\sthe\ssame\sFROM\sclause\sterm)\sreally\snecessary?\s\s\sThis\nbranch\sexplores\swhat\shappens\sif\swe\somit\sthat\srestriction.\s\sThis\sis\san\seffort\nto\saddress\sthe\sperformance\sregression\sreported\sby\n[forum:/forumpost/96b9e5709cf47cda|forum\spost\s96b9e5709cf47cda]\sthat\sis\scaused\nby\sflattener\srestriction\s29.
- D 2022-09-20T16:57:49.607
 -C Update\sthe\sfuzz\sinvariant\schecker\sto\sconform\sto\sthe\slatest\schanges\sin\ndbsqlfuzz.
 -D 2022-09-20T17:21:54.866
++C Merge\sthe\sfuzzcheck\sfix\sfrom\strunk\sinto\sthe\sflattener\simprovement\sbranch.
++D 2022-09-20T17:43:40.500
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2000,11 -2000,8 +2000,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 2647d73bb1876d01851f52cb3fd6af08a962ab336b6d51c160d27b1baf94f75f
- R 60a74f8c958f8f5c6d2d000c0573265e
- T *branch * flattener-omit-restriction-29
- T *sym-flattener-omit-restriction-29 *
- T -sym-trunk *
 -R 4c12344a007c9e9bdcdbf323756fa10a
++P 19270577ad1d08c9e6e5f0600396b8a1ccda9df1e67a0df845aee6b60437f379 8d8c124349d2a25200ace9a60d76751594b722468ad0c39d927a5d2c6e2464e0
++R e0204c145e73869d816b572fd2b71bc8
  U drh
- Z a7b69d349e01c35beb24d52a569b48a5
 -Z 7b99665ad0fc78591cd70e35a24e34f9
++Z dcbf3f74b6eb7e493002c755cbf2f6d6
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4791f75a70,7ec8709a6f..f0098c2225
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 19270577ad1d08c9e6e5f0600396b8a1ccda9df1e67a0df845aee6b60437f379
 -8d8c124349d2a25200ace9a60d76751594b722468ad0c39d927a5d2c6e2464e0
++930a8c1561d0d5dc70dc5378edac77f79ac59ab6569b561de3dfb02f160c38c5