From: stephan <stephan@noemail.net>
Date: Thu, 24 Oct 2024 15:57:29 +0000 (+0000)
Subject: Add missing ZERO_ARGUMENT_GENERATE_SERIES checks to ext/misc/series.c, as reported... 
X-Git-Tag: major-relase~205^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed959dba7df5b398ac8c576b123624db29fdb7f3;p=thirdparty%2Fsqlite.git

Add missing ZERO_ARGUMENT_GENERATE_SERIES checks to ext/misc/series.c, as reported via support mail.

FossilOrigin-Name: cd82e4c0f5f8ff16468b909d84dd5545c0456f624db61a4d112467a7cafed2fc
---

diff --git a/ext/misc/series.c b/ext/misc/series.c
index faf8fd0306..64f3be2c05 100644
--- a/ext/misc/series.c
+++ b/ext/misc/series.c
@@ -667,7 +667,9 @@ static int seriesBestIndex(
             idxNum &= ~0x3300;
             aIdx[5] = i;
             aIdx[6] = -1;
+#ifndef ZERO_ARGUMENT_GENERATE_SERIES
             bStartSeen = 1;
+#endif
             break;
           }
           case SQLITE_INDEX_CONSTRAINT_GE: {
@@ -675,7 +677,9 @@ static int seriesBestIndex(
             idxNum |=  0x0100;
             idxNum &= ~0x0200;
             aIdx[5] = i;
+#ifndef ZERO_ARGUMENT_GENERATE_SERIES
             bStartSeen = 1;
+#endif
             break;
           }
           case SQLITE_INDEX_CONSTRAINT_GT: {
@@ -683,7 +687,9 @@ static int seriesBestIndex(
             idxNum |=  0x0200;
             idxNum &= ~0x0100;
             aIdx[5] = i;
+#ifndef ZERO_ARGUMENT_GENERATE_SERIES
             bStartSeen = 1;
+#endif
             break;
           }
           case SQLITE_INDEX_CONSTRAINT_LE: {
diff --git a/manifest b/manifest
index fdd326e3d1..d87ba54555 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Beginnings\sof\srephrasing\s#if\sSQLITE_CORE\sto\s#ifdef/ifndef\sfor\sconsistency,\sas\sdiscussed\sin\s[forum:cea40371c5e34b09\s|\sforum\spost\scea40371c5e34b09].
-D 2024-10-24T07:44:13.131
+C Add\smissing\sZERO_ARGUMENT_GENERATE_SERIES\schecks\sto\sext/misc/series.c,\sas\sreported\svia\ssupport\smail.
+D 2024-10-24T15:57:29.106
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -424,7 +424,7 @@ F ext/misc/regexp.c 4bdd0045912f81c84908bd535ec5ad3b1c8540b4287c70ab840709636240
 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c
 F ext/misc/scrub.c 2a44b0d44c69584c0580ad2553f6290a307a49df4668941d2812135bfb96a946
-F ext/misc/series.c 596afbfbbc81ccf4ea6da11f016f7eed630ed195b5e9d548117e19f06d63f641
+F ext/misc/series.c ea604a16f9c5f7e09ccff3f18d94f2c3a6fa24ca08856156823d981873b8143c
 F ext/misc/sha1.c cb5002148c2661b5946f34561701e9105e9d339b713ec8ac057fd888b196dcb9
 F ext/misc/shathree.c 1821d90a0040c9accdbe3e3527d378d30569475d758aa70f6848924c0b430e8c
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
@@ -2219,11 +2219,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P da9124fee28c155c4d1cc0d3949eb7b588a7236c12883a010af7909ad8e534ef
-R 2ebdab3edb1350dc11d4104c859d9548
-T *branch * ifdef-SQLITE_CORE
-T *sym-ifdef-SQLITE_CORE *
-T -sym-trunk * Cancelled\sby\sbranch.
+P 58d91abf0c5a7712f27783640ef628681de18be5007020d6d8b362dd5a392eda
+R 03696d3fcf9d4a87c6a7add90a199e32
 U stephan
-Z b84db1ac2ea5639b2aff4682b7058a21
+Z 544a28ed9fdb6c5e441dfb7f96432068
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 34c437fa03..13cd48faa5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-58d91abf0c5a7712f27783640ef628681de18be5007020d6d8b362dd5a392eda
+cd82e4c0f5f8ff16468b909d84dd5545c0456f624db61a4d112467a7cafed2fc