From: drh <> Date: Sun, 6 Mar 2022 00:01:10 +0000 (+0000) Subject: Remove a NEVER() associated with sqlite_offset()> X-Git-Tag: version-3.38.1~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9d060e934ad8fe8e0d01baa728a2212356abedb;p=thirdparty%2Fsqlite.git Remove a NEVER() associated with sqlite_offset()> FossilOrigin-Name: bf2501e26c8e4c08d679ea930bab89b9510808439aee9412ab176a9d29635cc7 --- diff --git a/manifest b/manifest index b8dbd0b71a..8b40177a29 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\s'localtime'\smodifier\sin\sdate/time\sfunctions\sso\sthat\sit\spreserves\nfractional\sseconds.\n[forum:/forumpost/2ffbaa2c3fd7fb82|Forum\spost\s2ffbaa2c3fd7fb82]. -D 2022-03-05T20:20:45.594 +C Remove\sa\sNEVER()\sassociated\swith\ssqlite_offset()> +D 2022-03-06T00:01:10.263 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -624,7 +624,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3 -F src/vdbe.c 9dc667ab8ee2581713667e599e3b9b6c0c2516d7d49f426c278103b840d26696 +F src/vdbe.c 8239c69f3cb6fa27bac30d60c5a1ebac723abc007ff870ffc3af93e5159c7216 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8 F src/vdbeapi.c 8863ffb5a7bac42fe9a68aaa3526ee29fc18fb02a9b27188b756de41e33856e9 @@ -1944,9 +1944,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P cd87e77dd062b6b9479c14f28bf7b94db86e3538d8977dc46f92fab8674dbec8 -Q +1c875b0764ab00e95c92f0ee329659e88041763e125c2891201d80f68c41f717 -R e987d056419fd41d33ee9cbb43d71115 +P 6833f4aeef4923c3633978720277ccbfc63b26c96092c12a6330e6d4629b5eb5 +Q +e29dffcdba6f68af5cb76ca250e06a42183d9db92b60a16b2337b0d43c68bf2e +R bdd7ad0def0039de291b2732629843e7 U drh -Z 653117f6aaa3cfcdb0953668317b2385 +Z 70443762f95697f0e59b04e746817c2c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7222a4c926..a184d90a3a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6833f4aeef4923c3633978720277ccbfc63b26c96092c12a6330e6d4629b5eb5 \ No newline at end of file +bf2501e26c8e4c08d679ea930bab89b9510808439aee9412ab176a9d29635cc7 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 7163961f88..fa56689dff 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -2634,7 +2634,7 @@ case OP_Offset: { /* out3 */ rc = sqlite3VdbeFinishMoveto(pC); if( rc ) goto abort_due_to_error; } - if( NEVER(sqlite3BtreeEof(pC->uc.pCursor)) ){ + if( sqlite3BtreeEof(pC->uc.pCursor) ){ sqlite3VdbeMemSetNull(pOut); }else{ sqlite3VdbeMemSetInt64(pOut, sqlite3BtreeOffset(pC->uc.pCursor));