From: drh <>
Date: Sun, 21 Jul 2024 23:36:32 +0000 (+0000)
Subject: Merge debugging output fixes from trunk into the lateral-join branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a299ed1da682d81aee13e012dd758a589b06b4d1;p=thirdparty%2Fsqlite.git

Merge debugging output fixes from trunk into the lateral-join branch.

FossilOrigin-Name: 9182e999524bf55bf6a336c02ff5fb129a89ee7ed6fd859d4050ba1dbffcf4df
---

a299ed1da682d81aee13e012dd758a589b06b4d1
diff --cc manifest
index 44797d8782,ff73ecba3b..74c80cc82f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sto\sthe\scase\sof\sa\sLATERAL\ssubquery\sthat\sreferences\sa\sprior\stable\sthat\nuses\sa\scovering\sindex.\s[forum:/forumpost/fc29fa4f14|Forum\spost\sfc29fa4f14].
- D 2024-07-21T21:37:33.789
 -C Fixes\sto\sTreeView\sdebugging\soutput\sfor\sVALUES\sclauses.
 -D 2024-07-21T23:34:52.362
++C Merge\sdebugging\soutput\sfixes\sfrom\strunk\sinto\sthe\slateral-join\sbranch.
++D 2024-07-21T23:36:32.351
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -818,7 -818,7 +818,7 @@@ F src/test_window.c cdae419fdcea5bad6dc
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 3f703cacdab728d7741e5a6ac242006d74fe1c2754d4f03ed889d7253259bd68
- F src/treeview.c 324f285fde4de481be4595b3d1c3e1dc8de08e160f4dd4f79750678d2faca794
 -F src/treeview.c 774838df4e25956ca34ff79bef150266412cfc2640620d04e22d5c8a55a98992
++F src/treeview.c 4ea0cb81db9fc8187c53d90b50e99c6bfa3f79973212f927c018c53e371f11fb
  F src/trigger.c 0858f75818ed1580332db274f1032bcc5effe567cb132df5c5be8b1d800ca97f
  F src/update.c 732404a04d1737ef14bb6ec6b84f74edf28b3c102a92ae46b4855438a710efe7
  F src/upsert.c 2e60567a0e9e8520c18671b30712a88dc73534474304af94f32bb5f3ef65ac65
@@@ -840,9 -840,9 +840,9 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
- F src/where.c 44ae623e37aabed819bc7ecafe72b3c5a10216ad753c24614a0abd481007c40b
 -F src/where.c d87a4160e26a7a96a2f7ca283b147b1b283b54ba545c46acb14cfcc6ec37ae9e
++F src/where.c 060eda5c683cef33e435efbbd633d5ac7599693cb27a1b83181f2fcecff64565
  F src/whereInt.h 002adc3aa2cc10733b9b27958fdbe893987cd989fab25a9853941c1f9b9b0a65
 -F src/wherecode.c c9cac0b0b8e809c5e7e79d7796918907fb685ad99be2aaa9737f9787aa47349c
 +F src/wherecode.c 84f3b1d4c97d8b0c2e30d5b0f6d6a9dfd391fac79ff05df0e0d8cfc1d3728827
  F src/whereexpr.c 7d0d34b42b9edfd8e8ca66beb3a6ef63fe211c001af54caf2ccbcd989b783290
  F src/window.c 1e40ffc509bae21e466f6106382d238e91eb73edd4ba10e66ca4fd7af2b96896
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -2196,8 -2195,8 +2196,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 6c14b94fb678c70e32519f3e0141f80e6efb3015340a84eb355ab371c5e9facd
- R 813f23929aea30330fd76584e25b814c
 -P 2c122026db979a099a3d1a14ae1e01a0a64a559905ea414b2d80ed7dc3e04846
 -R 7c78963f5a281763614d42345d62144d
++P 6d863172dc736169bd5c303fab5d2fc47324261f29cdabb692781cd0fd609c87 b6aed8bcb06edc7f0221fd707d5adc227856fe62dbcaae5ffe1fb4faa5c542e1
++R f945ef86fef54dc43bf41701ceeec911
  U drh
- Z a22f7e9649de00a5eb8222bd7d670c43
 -Z e31a6d3bd1a00f1e50f69b067433df28
++Z 325044715fc2b274aef2f5fbc81890a3
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index e9e5af2029,d6b1dc535a..b782c8e550
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6d863172dc736169bd5c303fab5d2fc47324261f29cdabb692781cd0fd609c87
 -b6aed8bcb06edc7f0221fd707d5adc227856fe62dbcaae5ffe1fb4faa5c542e1
++9182e999524bf55bf6a336c02ff5fb129a89ee7ed6fd859d4050ba1dbffcf4df