Fix an operator typo - This indicates that the branch needs further

investigation and verification.

FossilOrigin-Name: f6ab67965b718b0c6d7faf769c7e47384cfd2ddbb03df518e0c5d367f8583387

diff --git a/manifest b/manifest
index 9853fc86d3965f09918fa96aa3e4305b5f631290..de9f7577904a6c1489289c94fad252dc91b0fc86 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correctly\sresolve\sleft\sand\sright\sUSING\scolumns\sof\san\souter\sjoin\sin\sa\nparenthesized\ssubjoin.
-D 2022-04-23T07:31:50.739
+C Fix\san\soperator\stypo\s-\sThis\sindicates\sthat\sthe\sbranch\sneeds\sfurther\ninvestigation\sand\sverification.
+D 2022-04-23T14:30:22.661
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -553,7 +553,7 @@ F src/printf.c 512574910a45341c8ad244bd3d4939968ebdfde215645b676fff01cc46e90757
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c b14bf8a4a1e3cb01eefc48a7e4129b15bb6a18b56d16dd4eca676586464337d0
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 3b3f8d2c51d6026bfbe26d8762f1844b995aa64d238100ffc86a04727fba134b
+F src/select.c 7236f3c4c1c27bd348dca60c746b1d48354c36d59223c673400c2115b871785e
 F src/shell.c.in ae0a6fae983caac6f8c824733f0599dfdf7b3a7e8efdef3cb5e3ab2e457ffc35
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1951,9 +1951,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7f8983345d1e3ac28d736fce9f90772aa0e4654670a1db3dd0ee45b55e92f2e4 3a6b0db4519072dbd41b1c105bf1a0c6b4dd90380e94a5662645d8d41483c707
-R 927028067d4c4ec54024cdb064902dd9
-T +closed 3a6b0db4519072dbd41b1c105bf1a0c6b4dd90380e94a5662645d8d41483c707
+P ea91aba88c31a042f4e32d66dfa089f95d0f9d316ab26f298085eb34dbf73e86
+R 9549b2a87feb210cf9948c9189de46e6
 U drh
-Z 2bcffb18ae205ac6850b1eb45df4f967
+Z 18a2689e41cce135eac2a900bbfdf7c7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 616ff463ee4b03c1579cc79cfe3485396e17c22e..3ea4478a455619814039cf066650dfad5faffa60 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea91aba88c31a042f4e32d66dfa089f95d0f9d316ab26f298085eb34dbf73e86
\ No newline at end of file
+f6ab67965b718b0c6d7faf769c7e47384cfd2ddbb03df518e0c5d367f8583387
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 1211f268aefcb6cbdc185ffaee3a83d3d7b38a9a..df4ad43956de47ca332423b2350c9872d01909dc 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5898,7 +5898,7 @@ static int selectExpander(Walker *pWalker, Select *p){
             pRight = sqlite3Expr(db, TK_ID, zName);
             if( (pTabList->nSrc>1
                  && (  (pFrom->fg.jointype & JT_LTORJ)==0
-                     || (selFlags && SF_NestedFrom)!=0
+                     || (selFlags & SF_NestedFrom)!=0
                      || !inAnyUsingClause(zName,pFrom,pTabList->nSrc-i-1)
                     )
                 )