From: dan Date: Tue, 7 Feb 2023 11:19:20 +0000 (+0000) Subject: Fix a dropped error code in wal.c. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3d452a826f9010bbe8d14c301855ee073747fbd;p=thirdparty%2Fsqlite.git Fix a dropped error code in wal.c. FossilOrigin-Name: 2537db6f6b9df00913b57e2ad0e4deef2040ce47b28f9a9939f42c0443d70ac9 --- diff --git a/manifest b/manifest index fec72887fe..540b816de6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sassert()\sin\ssqlite3WalFindFrame()\sso\sthat\sit\smatches\sthe\sequivalent\sassert()\son\strunk. -D 2023-02-07T10:58:39.543 +C Fix\sa\sdropped\serror\scode\sin\swal.c. +D 2023-02-07T11:19:20.199 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -705,7 +705,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac F src/vtab.c a39f6ed161f16a84ff445af9dba4776b2cf0898be08a33bee8e1128a66c0074b F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c d9645dd2b606b5df93cc21b072cabab30ec9a20de826a6059cc08c73d889dd25 +F src/wal.c 610c58e925fb98902b6939af9c3c8b1d3ab1cfbc5dd1e19db540c4619171cd26 F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b F src/where.c 3bbca705410258969d6d2e0c54b468de9674445d41b67714bb4fc3f1edef41d2 @@ -2059,8 +2059,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 e93113259e05fb6b81ad1b4a460bd54168ff5c372b643d4845c1b1c87b7db204 -R 0cf0e867c1d072053e4612b80f259abc +P f5bf91d9bf3910ab3dcf44c138084dfc26fb123edb8934bfdfcdd5c4afb67f2d +R f9886324061163f3fe48f6338ffe4fff U dan -Z 5cf3b3810b537b2d719a6a64e959fd37 +Z 88e782989721bd110052c1e06e2b2f03 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 56dbbc51f5..59e7028c8f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f5bf91d9bf3910ab3dcf44c138084dfc26fb123edb8934bfdfcdd5c4afb67f2d \ No newline at end of file +2537db6f6b9df00913b57e2ad0e4deef2040ce47b28f9a9939f42c0443d70ac9 \ No newline at end of file diff --git a/src/wal.c b/src/wal.c index 1dd95d69ec..ee227ea3ff 100644 --- a/src/wal.c +++ b/src/wal.c @@ -3918,6 +3918,7 @@ int sqlite3WalFindFrame( )){ rc = walSearchWal(pWal, !iApp, pgno, &iRead); } + if( rc!=SQLITE_OK ) return rc; #if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) if( iRead ){