From: drh <> Date: Thu, 14 Apr 2022 14:19:23 +0000 (+0000) Subject: Previous check-in accidentally inverted a test on an assert(). Fix that. X-Git-Tag: version-3.39.0~206^2~58^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c504f677b6378e7727dca82ec33ea4e6e97ea5cf;p=thirdparty%2Fsqlite.git Previous check-in accidentally inverted a test on an assert(). Fix that. FossilOrigin-Name: 5ec4f806c569428851b6f0159451aa3ed66b3bc61a845fd7c543cffb694b882d --- diff --git a/manifest b/manifest index 5f89ed4c4b..da78658373 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sassert()\sstatements\sassociated\swith\sartifical\snull-value\scursors\ncreated\sby\sRIGHT\sJOIN. -D 2022-04-14T12:59:25.672 +C Previous\scheck-in\saccidentally\sinverted\sa\stest\son\san\sassert().\s\sFix\sthat. +D 2022-04-14T14:19:23.735 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 df6107a37d3ee11ac94bb847aa8817894dd3a279bfc8b928c36f1b697201e3db +F src/vdbe.c 85a13807359cdfd9ea94140c16d2ad9d64da99c9287eb8dda84743779fd7e14e F src/vdbe.h 89f5edb1422c8783a0b29db836e409876f2b3e847f78e2b21b1fbcc48a93f85f F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217 @@ -1947,8 +1947,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 63b04c63de680261a0d3eaf27154a1e8e77e3e166c3f2dbaea985603991c74f7 -R 9bf8e7ee771780f4b1d0790385799db1 +P f5bce5f152259767497ae6826c558003822d976b3f35f4d74edee59a3490efb2 +R cf81eb9addb3ddebf19d1624814ed06a U drh -Z d30e0e99e2bb4c65405c63a835afccc6 +Z fb9cf63c0aab3de6d9e384a52fd24a3e # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9e67c5cbd0..fefaa8e5e7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f5bce5f152259767497ae6826c558003822d976b3f35f4d74edee59a3490efb2 \ No newline at end of file +5ec4f806c569428851b6f0159451aa3ed66b3bc61a845fd7c543cffb694b882d \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 5f018f200e..81f552998a 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -6266,7 +6266,7 @@ case OP_IdxRowid: { /* out2 */ assert( pC!=0 ); assert( pC->eCurType==CURTYPE_BTREE || IsNullCursor(pC) ); assert( pC->uc.pCursor!=0 ); - assert( pC->isTable!=0 || IsNullCursor(pC) ); + assert( pC->isTable==0 || IsNullCursor(pC) ); assert( pC->deferredMoveto==0 ); assert( !pC->nullRow || pOp->opcode==OP_IdxRowid );