Minor simplification of the comparison opcodes.

FossilOrigin-Name: 56474ebca3fdddb8f3c5156f06dc42dc0a65256c

diff --git a/manifest b/manifest
index 80c25b5906d68964acd2cc401d0bc4009f32f074..48536b00434bc82c373b464bd3120b3715a2c77f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\suninitialized\svariable\swarnings\sin\sspeedtest1.c.
-D 2016-10-18T15:29:57.091
+C Minor\ssimplification\sof\sthe\scomparison\sopcodes.
+D 2016-10-18T16:36:15.935
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -453,7 +453,7 @@ F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
 F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
-F src/vdbe.c 6aa65e22bd1a44eb0cb1fa040cb9955b6670e5dd
+F src/vdbe.c c93ae647b3b302234f3593fd686577216aa22543
 F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
 F src/vdbeInt.h 0a18713d0a2fec6807d076bd333d9bf3e57530cd
 F src/vdbeapi.c 8272f9342c39ab8d7eb4b9decc6caa7bc75b7d83
@@ -1526,7 +1526,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 6ca0e06b21b0d5f7ae5bcb7839a11a45da0d2cea
-R 8be4077c354adf7e25cd7dc6c043686c
+P 2aa7a03b8632dbfd9741018b5b19c372dcfd3647
+R 4e106c87e784e92bad6650fe8613fe88
 U drh
-Z dabbc883a61a919bd51f75d4eedc92e4
+Z 84c64fba90e2b1da59a52306d789b152

diff --git a/manifest.uuid b/manifest.uuid
index c29d224a0f090a43c9c2198a98fe7e451c1feaf4..091e1f1005cec3f9c1b4955b7776b4b2ec74523b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2aa7a03b8632dbfd9741018b5b19c372dcfd3647
\ No newline at end of file
+56474ebca3fdddb8f3c5156f06dc42dc0a65256c
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 4d7e7b99d6f476c5a5108248adbadfd00c6ed211..09019f3728f9d0392274a95553e9e972ed230a79 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2003,8 +2003,7 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
       assert( pOp->opcode==OP_Eq || pOp->opcode==OP_Ne );
       assert( (flags1 & MEM_Cleared)==0 );
       assert( (pOp->p5 & SQLITE_JUMPIFNULL)==0 );
-      if( (flags1&MEM_Null)!=0
-       && (flags3&MEM_Null)!=0
+      if( (flags1&flags3&MEM_Null)!=0
        && (flags3&MEM_Cleared)==0
       ){
         res = 0;  /* Operands are equal */