Add a NEVER() on a branch that was made unreachable by the

"circular reference" fix.

FossilOrigin-Name: 114d9780aecdd9f03f235fc1f2ab81ef89cb00b3bafa61cff612e939595ff5f0

diff --git a/manifest b/manifest
index 8fe9af1f46057edfd7fa8db57fe1250117561e41..95b93306a9abe8eb3c730fd06065225be9547cc6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sa\stest\scase\srequiring\sgenerate_series\swhen\svirtual\stables\sare\snot\navailable.
-D 2021-03-18T18:27:37.932
+C Add\sa\sNEVER()\son\sa\sbranch\sthat\swas\smade\sunreachable\sby\sthe\n"circular\sreference"\sfix.
+D 2021-03-18T20:04:46.953
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -542,7 +542,7 @@ F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c dd47248c2c914feb0d4428c27d782e2723971d32cfa5536f49306d080df4d45a
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c bbad9e0daf1f722eccd492d74a145f8aafbeb78c8c4d713097fe02637d1ef5d5
+F src/select.c 72b2a58bf6e01812c7ea392ab3dc9c7faa814d5558f98d9e4fd6a142f562c608
 F src/shell.c.in 8df3912a7ca4873a1443d4adef1b25baee8c086ab479fd9c4f13ab03f98049ab
 F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9981223618782bf867dfc8988d0c634a42f569228880c5c5e00aa4ae762cfff2
-R d3f85bdc4c6bc6470e1b838410b3768f
+P ee86e2f4c5999a090a5d2fe8251107cf55e621a6b988f315eb82f462cc1e377d
+R 51db1a8cd353cea4b335d0a191e38003
 U drh
-Z e3e3cb902cadc8dca562e6564c365de6
+Z 06f86de8c8593bdbc3934905423493ca

diff --git a/manifest.uuid b/manifest.uuid
index c35b0d2b95b6c6dd20cd3827df1e7c2074c3da28..2a8120d42adbdded2576197f1fc272286364d563 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee86e2f4c5999a090a5d2fe8251107cf55e621a6b988f315eb82f462cc1e377d
\ No newline at end of file
+114d9780aecdd9f03f235fc1f2ab81ef89cb00b3bafa61cff612e939595ff5f0
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index db9bd34a5d3a29edbb93bdcabae3c4bdaed709e1..0c0bd84f2e9f28564dc67da4a0f2bfea54e322fa 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1986,7 +1986,7 @@ int sqlite3ColumnsFromExprList(
     nCol = pEList->nExpr;
     aCol = sqlite3DbMallocZero(db, sizeof(aCol[0])*nCol);
     testcase( aCol==0 );
-    if( nCol>32767 ) nCol = 32767;
+    if( NEVER(nCol>32767) ) nCol = 32767;
   }else{
     nCol = 0;
     aCol = 0;