From 427db2d2452d52075feb28f4ae33e65978dc0dc4 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 7 Apr 2019 18:21:12 +0000 Subject: [PATCH] Make the testcase() macro added in the previous check-in reachable for testing. FossilOrigin-Name: 80704a16f6dbbeacc65fa36a3623df10292a28aeacf9e2c1d2891258479e3b89 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/vdbemem.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 36d9f1b4ef..7098743fed 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sfaulty\sassert()\sin\sthe\ssqlite3VdbeMemExpandBlob()\sroutine. -D 2019-04-07T18:04:57.144 +C Make\sthe\stestcase()\smacro\sadded\sin\sthe\sprevious\scheck-in\sreachable\sfor\ntesting. +D 2019-04-07T18:21:12.384 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -595,7 +595,7 @@ F src/vdbeInt.h 2c12704db9740c8e899786ecfc7a5797a9d067563496eb1b6ed03c592d7b8d90 F src/vdbeapi.c a6e462bd7853e272cf614d6fbda7f3f20c89a2d255805855b32895a5983ddcec F src/vdbeaux.c 7aa412e7e56eb53649d87766f3064994a31991ee2b2716bf8c3129fa15cc7653 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191 -F src/vdbemem.c 340bf04f095d55c26299849a1ffc356c24906e12fe618cbbc0d919d290457c06 +F src/vdbemem.c 6690c982552dbdd54cc182d0150dfa86121121934f2bd9492f0abf2e847b712d F src/vdbesort.c 90aad5a92608f2dd771c96749beabdb562c9d881131a860a7a5bccf66dc3be7f F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392 F src/vtab.c 2462b7d6fd72b0b916477f5ef210ee49ab58cec195483ebdac0c8c5e3ec42cab @@ -1814,7 +1814,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P edb095a9a679c8c702abd0a487e55ed4b09110b54bcd7d5275020576f2713a39 -R b1b831f46bb9a54c2be05d85e4d76596 +P df58774e994bd306b1a2e1f259e7e4408f01c5b1dc104673698168bbf8a63ce5 +R 8f225a384e99d5cc8fcbc3b1a5a25930 U drh -Z 39681fb72b93d8847d98f82bd386460b +Z 42970063c3d79b8d4bcc406c6a540b2c diff --git a/manifest.uuid b/manifest.uuid index 88ac35be75..fdff836f77 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -df58774e994bd306b1a2e1f259e7e4408f01c5b1dc104673698168bbf8a63ce5 \ No newline at end of file +80704a16f6dbbeacc65fa36a3623df10292a28aeacf9e2c1d2891258479e3b89 \ No newline at end of file diff --git a/src/vdbemem.c b/src/vdbemem.c index ed1f8d5e00..06388bfc5a 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -302,7 +302,7 @@ int sqlite3VdbeMemExpandBlob(Mem *pMem){ int nByte; assert( pMem->flags & MEM_Zero ); assert( (pMem->flags&MEM_Blob)!=0 || MemNullNochng(pMem) ); - testcase( MemNullNochng(pMem) ) + testcase( sqlite3_value_nochange(pMem) ); assert( !sqlite3VdbeMemIsRowSet(pMem) ); assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );