Fix the sqlite3SrcListAppendList() routine so that it correctly adds

the JT_LTORJ attribute to the first SrcItem, if needed.

FossilOrigin-Name: 07ed0dca310d828f9fe152efa8ee2a89202771a8f661afa1dbeee34aaabef67a

diff --git a/manifest b/manifest
index dadd1cbe4d31d98c9172e2c5b261671024eba5d8..539aa8cb555e2919febfbc6d8a032c2184e4f7c7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Leave\ssqlite3ProcessJoin()\searly\sif\san\sOOM\sis\sencountered\sin\sthe\sNATURAL\nto\sUSING\sconverter.\s\sThis\savoids\sNULL\spointer\sdereferences\sfurther\salong\sin\nthe\scode.
-D 2022-04-18T09:59:33.646
+C Fix\sthe\ssqlite3SrcListAppendList()\sroutine\sso\sthat\sit\scorrectly\sadds\nthe\sJT_LTORJ\sattribute\sto\sthe\sfirst\sSrcItem,\sif\sneeded.
+D 2022-04-18T10:09:29.854
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 093c940ddf1d0753542d04e37eb9903cbc126e997815d234dd2b6317e812b192
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
-F src/build.c d6518b209ec89e0b0c744564213369b772b00efa698c3f121d14cf25c5806ade
+F src/build.c f7098ca5006891b1877fb2e8f9aa52243338983696123f5a4e30fa9dda06debc
 F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 026dbdcdbd8c3cde98a88483ee88310ff43150ab164ad768f12cc700a11495ad
@@ -1948,8 +1948,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 584bd55e20669d09b7efe3429ba847c42c32fb1eb960784c4e0dedcd96899313
-R ca8f575b2af503ca4b68b7060e8a8208
+P 0ccb224e13ad44c7e1a3aa186821a929faabc0075fe15799476c00d9a92e9d91
+R 868a3abe5b71496a81ccd2968e4bc123
 U drh
-Z 9aaf25063fb0e8b19b18a7c621baebac
+Z 4d37f6a11fcac66c4ed7fb866c6b8bbc
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a2cbf273c4a7bb3629fd1ba217981cd563bf48c7..b6fbaa25a31133e028b429b61924947dc465ac1b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ccb224e13ad44c7e1a3aa186821a929faabc0075fe15799476c00d9a92e9d91
\ No newline at end of file
+07ed0dca310d828f9fe152efa8ee2a89202771a8f661afa1dbeee34aaabef67a
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index cf277b9073c315b482ea1726b00c0dd9ee13c2a7..126897c856d3502b70f1ad26a36a8f9d4fe8d3d1 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -5032,6 +5032,7 @@ SrcList *sqlite3SrcListAppendList(Parse *pParse, SrcList *p1, SrcList *p2){
       p1 = pNew;
       memcpy(&p1->a[1], p2->a, p2->nSrc*sizeof(SrcItem));
       sqlite3DbFree(pParse->db, p2);
+      p1->a[0].fg.jointype |= (JT_LTORJ & p1->a[1].fg.jointype);
     }
   }
   return p1;