Add a CORRUPT_DB term to an assert() added earlier today.

FossilOrigin-Name: 304739d2382446e7b698d67377679168e46f0a19bb0794fdf22d0a0a84a8cbcc

diff --git a/manifest b/manifest
index 2ff5cbd73ef49ab24b81575380a2c4d7b1d249d1..282995bd8b3561542061833303a716701cf4bac2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2021-05-17T17:14:38.533
+C Add\sa\sCORRUPT_DB\sterm\sto\san\sassert()\sadded\searlier\stoday.
+D 2021-05-18T00:52:06.135
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -615,7 +615,7 @@ F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 41c7a72da1df47864faa378a1c720b38adb288c6838cb6be5594511b6287a048
 F src/vacuum.c 492422c1463c076473bae1858799c7a0a5fe87a133d1223239447c422cd26286
-F src/vdbe.c d84dd30f6918ef9b3dcb16c2a5d3183632776634efe2bc7040875ea68ee5932e
+F src/vdbe.c 50d998ebf8fe6dcefa91348356aa3dbaf0bae641b074c9f6e8503960eab81324
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h 58980223a32495ad059d10581b83e133abdc77248b1bab85c080cab8a13bd819
 F src/vdbeapi.c d9e99daf59fec928986838b3389a7337e82fec6b3b5de30206cb99fb4661b94e
@@ -1913,7 +1913,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 4221f41af9df90da4183d45d0edfae19b4f7095ec35a203c8dfd2712799e3839
-R d5d98a0de42894b8e3a0e6933785a46c
+P ace12a3912a4fdc2f0e741361ec705652a11b6f5e3548d54bd6f273671ba1e09
+R 3a98ece07fd92e596898a809807a6bbc
 U drh
-Z 328f07f3b463752989563aff06a98cf6
+Z 33a192c540dbf0ed69fe9c38b332df0c

diff --git a/manifest.uuid b/manifest.uuid
index ef36117f347ef3360a54793c0912282dc4b7fcbb..560a3ca49a762b233f1a2360454e744a6434aa9c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ace12a3912a4fdc2f0e741361ec705652a11b6f5e3548d54bd6f273671ba1e09
\ No newline at end of file
+304739d2382446e7b698d67377679168e46f0a19bb0794fdf22d0a0a84a8cbcc
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 3ee9a1cf620c6441c82727cd385bf00f34bf9bcd..1d255d3ee896d4e4ca27424bf71711ee5a0bc662 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2045,7 +2045,7 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
   flags1 = pIn1->flags;
   flags3 = pIn3->flags;
   if( (flags1 & flags3 & MEM_Int)!=0 ){
-    assert( (pOp->p5 & SQLITE_AFF_MASK)!=SQLITE_AFF_TEXT );
+    assert( (pOp->p5 & SQLITE_AFF_MASK)!=SQLITE_AFF_TEXT || CORRUPT_DB );
     /* Common case of comparison of two integers */
     if( pIn3->u.i > pIn1->u.i ){
       iCompare = +1;