From: drh <drh@noemail.net>
Date: Sat, 13 Aug 2016 13:03:46 +0000 (+0000)
Subject: Improvements to commits.  No code changes.
X-Git-Tag: version-3.15.0~110^2~75^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af69eda63efbb5461a86cfddd871a39134eef8e4;p=thirdparty%2Fsqlite.git

Improvements to commits.  No code changes.

FossilOrigin-Name: 18f5a3bee4f870be4644a6042a20081c46edb7d0
---

diff --git a/manifest b/manifest
index b2cbce9bc1..23cd1d16e7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sto\sthe\svector\sless-than\soperator.\s\sAll\slegacy\stests\spassing\snow.
-D 2016-08-13T12:37:47.521
+C Improvements\sto\scommits.\s\sNo\scode\schanges.
+D 2016-08-13T13:03:46.411
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -450,7 +450,7 @@ F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
 F src/vacuum.c 9dd2f5d276bc6094d8f1d85ecd41b30c1a002a43
-F src/vdbe.c 9816bc4f89e4d58340f3cf3354fd062e2da11f8a
+F src/vdbe.c 3961408d1e4507b468b6297b79307bd3eee51988
 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
@@ -1516,7 +1516,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 dfc028cfbe7657d20727a2670ecadb1575eb8cbb
-R 051307c8175981bed144504907ca38ff
+P ec70a67ebc997f457be4d52d8affc37e142dc3ff
+R 247af002c746a42b304e23bb96c4f14d
 U drh
-Z bf986d41b4b86a5837f36c1caf70f646
+Z 092630ac00e90be639ed64dcd2fc60ce
diff --git a/manifest.uuid b/manifest.uuid
index b233b1a33d..efc7c5409f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec70a67ebc997f457be4d52d8affc37e142dc3ff
\ No newline at end of file
+18f5a3bee4f870be4644a6042a20081c46edb7d0
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index be5ca79ed5..f401f65bcd 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2004,16 +2004,16 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
        && (flags3&MEM_Null)!=0
        && (flags3&MEM_Cleared)==0
       ){
-        cmpRes = 0;  /* Results are equal */
+        cmpRes = 0;  /* Operands are equal */
       }else{
-        cmpRes = 1;  /* Results are not equal */
+        cmpRes = 1;  /* Operands are not equal */
       }
     }else{
       /* SQLITE_NULLEQ is clear and at least one operand is NULL,
       ** then the result is always NULL.
       ** The jump is taken if the SQLITE_JUMPIFNULL bit is set.
       */
-      cmpRes = 1;
+      cmpRes = 1;    /* Operands are not equal */
       if( pOp->p5 & SQLITE_STOREP2 ){
         pOut = &aMem[pOp->p2];
         memAboutToChange(p, pOut);
@@ -2108,9 +2108,10 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
 /* Opcode: ElseNotEq * P2 * * *
 **
 ** This opcode must immediately follow an Lt or Gt comparison operator.
-** If the operands in that previous comparison are not equal (possibly
-** because one or the other is NULL) then jump to P2.  If the two operands
-** of the prior comparison are equal, fall through.
+** If the operands in that previous comparison had been used with an Eq
+** operator and if the result of that Eq would be NULL or false (0), then
+** then jump to P2.  If the result of comparing the two previous operands
+** using Eq would have been true (1), then fall through.
 */
 case OP_ElseNotEq: {       /* same as TK_ESCAPE, jump */
   assert( pOp>aOp );