Change the assert() back into a testcase(). See also check-ins

[9ab985a9c8160b90] and [ddb17d92df194337] and other check-ins that those
reference.  Fix for ticket [9d708e474201c001]

FossilOrigin-Name: 2c44c73499154bc57634a54cb743642d0aacc93a1336fbb8bb3eb5dbbf616357

diff --git a/manifest b/manifest
index 7b3bdf63e708f22c1c0ced3cba5eb4150c6453af..07d4615793ef9c00f143a63016dbbb942073fa41 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\ssqlite3VdbeMemAboutToChange()\sshallow-copy\svalidation\smechanism\nby\sadding\sthe\snew\sOP_ReleaseReg\sopcode\sto\stell\sMemAboutToChange()\sthat\sa\nrange\sof\sregisters\sis\sno\slonger\sneeded\sso\sthat\sthe\ssource\sregister\scan\sbe\nfreely\schanged.\s\sThis\sis\sa\schange\sto\sdebugging\sand\stest\sbuilds\sonly\sand\ndoes\snot\simpact\srelease\sbuilds.\s\sFix\sfor\sticket\n[c62c5e58524b204d]\sand\s[5ad2aa6921faa1ee].\s\sThe\sprevious\sfix\sto\sticket\n[5ad2aa6921faa1ee]\sis\sbacked\sout\sby\sthis\schange\ssince\sthis\schange\sis\sa\sbetter\nfix.
-D 2019-12-23T02:18:49.115
+C Change\sthe\sassert()\sback\sinto\sa\stestcase().\s\sSee\salso\scheck-ins\n[9ab985a9c8160b90]\sand\s[ddb17d92df194337]\sand\sother\scheck-ins\sthat\sthose\nreference.\s\sFix\sfor\sticket\s[9d708e474201c001]
+D 2019-12-23T02:43:52.798
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/upsert.c b445315c8958d8f17ec3297d06842e61dacaad0633ccaec1e4e160de7e562212
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 2c92bc706bbdb1c45a25180291e7e05a56e297aa5dd7b2bcd2b1c47e8bb05b17
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c 979cb8e16e4aebd9f1838260902225c68e706f6ab92781fc119937907140cb89
+F src/vdbe.c edbd3ce5a927f54db387f39f385ab2a71c92a11d68e8dbf38295a024df4476bd
 F src/vdbe.h 3f068f00b23aebf392df142312ab5874588371c6d83e60d953f6d6b6453491c5
 F src/vdbeInt.h bd589b8b7273286858950717e0e1ec5c88b18af45079a3366dc1371865cea704
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
@@ -1852,7 +1852,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 9ab985a9c8160b905730678f40ed440a246cdec549c798bafefaed5abbc0437f
-R 6c6b2e22daef2e006951b2518e920f13
+P 36fdeb4f0a66970a35de688b617f90899c89cfdfab659f864df99aa7ebf854ea
+R b61ef50f9763d22c9ba3b648f8895f79
 U drh
-Z 39eb7f22f14aaa3d3fa5e8c0432689d5
+Z 6074358839366f26b48e0a14aadff323

diff --git a/manifest.uuid b/manifest.uuid
index 0ac42976c81e283321457b79537c01a0dbbe1ba2..12e01de17fdc0fb9ecc969c7d561cd9329fdab15 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36fdeb4f0a66970a35de688b617f90899c89cfdfab659f864df99aa7ebf854ea
\ No newline at end of file
+2c44c73499154bc57634a54cb743642d0aacc93a1336fbb8bb3eb5dbbf616357
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 6bd38c684e1eea98a33e2948b3b08576713b3c71..ca765e30741f97aaef8d3ddcfc9dfef7739b9f53 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2028,12 +2028,7 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
       if( (flags1 | flags3)&MEM_Str ){
         if( (flags1 & (MEM_Int|MEM_IntReal|MEM_Real|MEM_Str))==MEM_Str ){
           applyNumericAffinity(pIn1,0);
-          assert( flags3==pIn3->flags );
-          /* testcase( flags3!=pIn3->flags );
-          ** this used to be possible with pIn1==pIn3, but not since
-          ** the column cache was removed.  The following assignment
-          ** is essentially a no-op.  But, it provides defense-in-depth
-          ** in case our analysis is incorrect, so it is left in. */
+          testcase( flags3!=pIn3->flags );
           flags3 = pIn3->flags;
         }
         if( (flags3 & (MEM_Int|MEM_IntReal|MEM_Real|MEM_Str))==MEM_Str ){