From: drh <> Date: Thu, 5 Jan 2023 14:41:18 +0000 (+0000) Subject: Changes a testcase() into an assert() due to the X-Git-Tag: version-3.41.0~142 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50da6ac8c1bd1c5bb22021f873e0e64ef53295cc;p=thirdparty%2Fsqlite.git Changes a testcase() into an assert() due to the [e58bba93717cd6ff] change. FossilOrigin-Name: a6251d72894f9c2e21fc6e91b1d2452a204952f5e1a94fd93835a47c7dfb9be3 --- diff --git a/manifest b/manifest index e0ad76fcd2..08c2d198fe 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\swith\sapplying\sinteger\saffinity\sto\sa\sMEM_IntReal\svalue.\sForum\spost\s[forum:/forumpost/d270125fae|forum\spost\sd270125fae]. -D 2023-01-05T13:35:23.331 +C Changes\sa\stestcase()\sinto\san\sassert()\sdue\sto\sthe\n[e58bba93717cd6ff]\schange. +D 2023-01-05T14:41:18.215 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -717,7 +717,7 @@ F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 F src/util.c 0e5cf9062a796f0f1b6b3228b121b2344932c05425f7c8b5a7cb245812473bbd F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd -F src/vdbe.c 5146547a60e2afe79f8d4e089e6d4e4af7c20dff8726b4afdc3e651951965926 +F src/vdbe.c d05e97e6845f2d29a9e6d08b143946513d48449408e11b1d2465787d25713080 F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c F src/vdbeInt.h fc15815b7bdafbb27e7f027faba2b0112e87d382c0d72241672528806ebc0db5 F src/vdbeapi.c 4ee67890913c1d2469c68e3ad2e7ddeab57ac5924a64bbfd0906a8ea0d542c7f @@ -2068,8 +2068,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 d32757ddf5d311b6f62545c861fd606244e03f02cb2e317c1131ee6b80c2299c -R 43a48a6ce0ca4ae5f2a61e4123b4d02f -U dan -Z 2b2dc45aecbee0087730c69517333ab0 +P e58bba93717cd6ff950c6f9e077b4327b59b1956dd5f6668be3de9509584b8fe +R b0693ceebcfd21105fef77667ba71a94 +U drh +Z 1653d29d1da89afb6a78df7f43f0bf8d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c0da8144e5..57ba7b7288 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e58bba93717cd6ff950c6f9e077b4327b59b1956dd5f6668be3de9509584b8fe \ No newline at end of file +a6251d72894f9c2e21fc6e91b1d2452a204952f5e1a94fd93835a47c7dfb9be3 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 8f96a17b78..8226e2cd76 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3142,7 +3142,7 @@ case OP_TypeCheck: { } case COLTYPE_REAL: { testcase( (pIn1->flags & (MEM_Real|MEM_IntReal))==MEM_Real ); - testcase( (pIn1->flags & (MEM_Real|MEM_IntReal))==MEM_IntReal ); + assert( (pIn1->flags & MEM_IntReal)==0 ); if( pIn1->flags & MEM_Int ){ /* When applying REAL affinity, if the result is still an MEM_Int ** that will fit in 6 bytes, then change the type to MEM_IntReal