From: drh <>
Date: Sat, 9 Apr 2022 03:12:52 +0000 (+0000)
Subject: Merge the sqlite3WhereMalloc() routine from trunk into the right-join branch.
X-Git-Tag: version-3.39.0~206^2~64^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1871630908063abfb0915fd0598f0a1ff783666;p=thirdparty%2Fsqlite.git

Merge the sqlite3WhereMalloc() routine from trunk into the right-join branch.

FossilOrigin-Name: b1b3845aa38f469a27f07c8f6e8a98334f7967b19661ee4cf155d6997afd9d4c
---

c1871630908063abfb0915fd0598f0a1ff783666
diff --cc manifest
index 3f80acc376,bf8983c822..65eef2b977
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Preliminary\scode\sto\ssupport\sRIGHT\sJOIN.\sEverything\sseems\sto\swork,\sexcept\sthat\nthe\scode\sto\scompute\sthe\sunmatched\srows\sfor\sthe\sRIGHT\sJOIN\shas\snot\syet\sbeen\nadded,\sso\sthe\sresult\sof\sa\sRIGHT\sJOIN\sis\scurrently\sthe\ssame\sas\san\sINNER\sJOIN.
- D 2022-04-08T19:20:12.051
 -C The\ssqlite3WhereMalloc()\sroutine\sallocates\smemory\sthat\sis\sautomatically\ndeleted\swhen\sthe\scorresponding\sWhereInfo\sobject\sis\sdestroyed.
 -D 2022-04-09T03:06:01.731
++C Merge\sthe\ssqlite3WhereMalloc()\sroutine\sfrom\strunk\sinto\sthe\sright-join\sbranch.
++D 2022-04-09T03:12:52.801
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -639,10 -639,10 +639,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c c752850f0d4b21656ef2901484fb7c799a6d20efe1d13fa5e77a3554b7568625
- F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
- F src/wherecode.c 7025f2a5b8b160af7ec4837e5d3c5befc2e61f0aafeea3f5f0403e46674f284f
- F src/whereexpr.c a4542ee72e05e4ab9dfadb5ddc0116007dc2420763992a79dbe83aaf73212311
 -F src/where.c 929ac88a1b65bcdef7e05a0b87b13a0c55cd3d5d3bc27ec81a6f37eaca13e5fe
++F src/where.c 20b6907d66577c02bc2be434c3c8fd5f00f0112d467cb8ae5d97ced3af14f484
+ F src/whereInt.h 41ce0a8c0368372d8422e420e05a1e037624ce52fae139c3c19538ee491fb4c0
 -F src/wherecode.c b7bc24b150d6a47c48844f89c3bf6d8f694780acb71768c83b9bec8a729e0d81
 -F src/whereexpr.c 2ce4ff64b80fce0a0f7579f5ec2b953f10952a3410c441564e12b650ea8c2aba
++F src/wherecode.c 79813939e009cbd8a042d57e6c0cad1a437d8e2e19b8be61c70760089f055c89
++F src/whereexpr.c ac8985bbd983f34273b1e0d05cd738ff436331674c1b22f4caf6537e1eca4691
  F src/window.c 42a71595263dbd8ef8248218e4fc7d4b5ddccece52146ad48e079342d93f6f8f
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1945,11 -1945,8 +1945,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 8efd61e8518594e3e9c84681fc35796a78fe8885a97ad4dd19f1573ee8065b18
- R 322c8c2f976fdab57b24f3e90a096129
- T *branch * right-join
- T *sym-right-join *
- T -sym-trunk *
 -R 48010733dae82cb9023efd9a61e0d9ba
++P 415abd6731b8e8a605adabfa6066c8a852a8531c300df41325d5f7e75cae5a70 f237e1d8cc41b937f34288daebfacf5f7b0990a807a805e0cb6b45bc730192d6
++R 14570ffbcb3ed6fd5a47242c31653712
  U drh
- Z 04b77679382a7e72969224c19421c972
 -Z a50ac2a16236eccfde93e32da194e6bb
++Z 80db52d601f5cc05776abad4ced7d9c5
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 9efedb98ec,0f6e9d2f91..b82dd29e59
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 415abd6731b8e8a605adabfa6066c8a852a8531c300df41325d5f7e75cae5a70
 -f237e1d8cc41b937f34288daebfacf5f7b0990a807a805e0cb6b45bc730192d6
++b1b3845aa38f469a27f07c8f6e8a98334f7967b19661ee4cf155d6997afd9d4c