From: drh <>
Date: Mon, 2 May 2022 15:31:06 +0000 (+0000)
Subject: Document (in comments) that the SQLITE_FlttnUnionAll bit has a specific value
X-Git-Tag: version-3.39.0~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c35f02d676bb990ef18354c4a5fa3cf75f267abc;p=thirdparty%2Fsqlite.git

Document (in comments) that the SQLITE_FlttnUnionAll bit has a specific value
needed by TH3.

FossilOrigin-Name: bcaa4a44749d157c5953c6f54c88b1ba29b4035f4b21fce986b7efbea372e109
---

diff --git a/manifest b/manifest
index 6331a9645d..f4819dbeb5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\scompiler\swarning\sin\ssqlite3TreeViewWinFunc()\s(a\sroutine\sthat\ndoes\snot\seven\sappear\sin\srelease\sbuilds).
-D 2022-05-02T15:23:59.708
+C Document\s(in\scomments)\sthat\sthe\sSQLITE_FlttnUnionAll\sbit\shas\sa\sspecific\svalue\nneeded\sby\sTH3.
+D 2022-05-02T15:31:06.026
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -558,7 +558,7 @@ F src/shell.c.in ae0a6fae983caac6f8c824733f0599dfdf7b3a7e8efdef3cb5e3ab2e457ffc3
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
-F src/sqliteInt.h b076cfab9455b6ef1245667ff73dada79a204c750985f788e52469727f0d1c31
+F src/sqliteInt.h 3247ce80347c99739850798a34b1179e396801c5fc0c8216892f7f134990672f
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1951,8 +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 cc458317bd77046c4328715ae9e3409f3f4cd422a01162cb33405ef3a142b0a3
-R 7b2c26fca08c4096a6d6906e453b4c50
+P daff6070039e45df7c47b323a8352e56d1264a7bfb065fe2d79c58454c95a262
+R 916db3a0a95e071bc97fd8372b15f4b3
 U drh
-Z 76eb5c6ba92cbe3f261ef935a3f5fceb
+Z 75675c6853367abc92437cf9f7c9cc0c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 86f5a5d2b9..ee9d52391d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-daff6070039e45df7c47b323a8352e56d1264a7bfb065fe2d79c58454c95a262
\ No newline at end of file
+bcaa4a44749d157c5953c6f54c88b1ba29b4035f4b21fce986b7efbea372e109
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index e9f0af544a..37d9db8b6a 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1781,6 +1781,7 @@ struct sqlite3 {
 #define SQLITE_BalancedMerge  0x00200000 /* Balance multi-way merges */
 #define SQLITE_ReleaseReg     0x00400000 /* Use OP_ReleaseReg for testing */
 #define SQLITE_FlttnUnionAll  0x00800000 /* Disable the UNION ALL flattener */
+   /* TH3 expects this value  ^^^^^^^^^^ See flatten04.test */
 #define SQLITE_AllOpts        0xffffffff /* All optimizations */
 
 /*