From: drh <> Date: Wed, 18 Mar 2026 13:49:06 +0000 (+0000) Subject: Adjust the fix at [f7389cdb129d3386] so that integrity_check output still X-Git-Tag: major-release~74^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15a3b2d4e1b2dd18cf4fea74a3d8b5682a2cb79a;p=thirdparty%2Fsqlite.git Adjust the fix at [f7389cdb129d3386] so that integrity_check output still appears prior to the SQLITE_CORRUPT return. FossilOrigin-Name: efd9a7a6c862f778da9cd74e38f674e5d1094aa1c566ea3e68553e83f59502d3 --- diff --git a/manifest b/manifest index e2719d3139..7395be6fdb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Simplification\sto\sthe\slogic\sthat\sdecides\swhether\sor\snot\san\sindex\nfield\smatches\swhen\sfloating\spoint\svalues\sare\sclose\sbut\snot\sexact. -D 2026-03-18T12:36:01.646 +C Adjust\sthe\sfix\sat\s[f7389cdb129d3386]\sso\sthat\sintegrity_check\soutput\sstill\nappears\sprior\sto\sthe\sSQLITE_CORRUPT\sreturn. +D 2026-03-18T13:49:06.440 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -799,7 +799,7 @@ F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165 F src/util.c 0dbd633bdc509a1c967e4b49b1555820494d936131017634d7dec96c0b8343ce F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82 -F src/vdbe.c ad2275c459f088076b8a99a63230cd9514bb21a4cff98ce73d90e9611c57cad2 +F src/vdbe.c efb45e9c234a85ccb3c515a1af93832530a480bbc0a940929bf156c174c1df64 F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71 F src/vdbeInt.h f7157f110f88f1d9d8338c292faf23a9129f6712563ade2b408537c95e17bdef F src/vdbeapi.c 6cdcbe5c7afa754c998e73d2d5d2805556268362914b952811bdfb9c78a37cf1 @@ -2194,8 +2194,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P aa211fa1d49b6734913e957f9e4b9825709a1493d275f7dfaf9123dc8c7232dc -R 4f3fe27634efc590d052577adbce04a9 +P 3897017c0e871c676d44786a6f11205fd4b7a947d9d1359109037a123eda6b9b +R 73600f580eaebbec61297b6f462c4de4 U drh -Z 447592fe10f2c2a8e9592d7fbe83953e +Z e42aca416c59e4e8dcb962a969c82b1f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e61503c777..061f19cd15 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3897017c0e871c676d44786a6f11205fd4b7a947d9d1359109037a123eda6b9b +efd9a7a6c862f778da9cd74e38f674e5d1094aa1c566ea3e68553e83f59502d3 diff --git a/src/vdbe.c b/src/vdbe.c index 19c8743f2a..647e2eb228 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -7325,8 +7325,10 @@ case OP_IFindKey: { /* jump, in3 */ r.pKeyInfo = pC->pKeyInfo; rc = sqlite3VdbeFindIndexKey(pC->uc.pCursor, pOp->p4.pIdx, &r, &res, 1); - if( rc ) goto abort_due_to_error; - if( res!=0 ) goto jump_to_p2; + if( rc || res!=0 ){ + rc = SQLITE_OK; + goto jump_to_p2; + } pC->nullRow = 0; break; };