diff --git a/manifest b/manifest index 4606d87635..03e22ae49a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sVdbeCoverage()\sand\sVdbeCoverageIf()\smacros\sfor\simproved\sVDBE\scoverage\ntesting. -D 2014-02-18T03:07:12.342 +C Fix\sVDBE\sbranch\saccounting\son\scomparison\soperators. +D 2014-02-18T11:31:59.914 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -277,7 +277,7 @@ F src/update.c 16d6555a32298da18ce6e2a00637c462d9e3ac97 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269 F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 -F src/vdbe.c 392f03b25152eb44565a78b8b809743c97e5852b +F src/vdbe.c 6e3d5d4c68076c09724c74bc5c39985a204e55a0 F src/vdbe.h f429f5e5e14b02acbdffb2b2e8ba6e865e66e320 F src/vdbeInt.h 5286af9067cabdb8ba57b87c0c988a931be6c6c8 F src/vdbeapi.c 5bc41aaea448a7fc250902c418f1795859be3820 @@ -1151,7 +1151,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 915f6f1c7aab54583729e60bdc1565f25ecc6f74 -R d0043e1267f21a1ea521214d42169c3d +P b92d31a97d5fe4606d9ae1393c7f3e052f46bf5a +R ac3bce6c9f7bb42059d2e404010fd2bc U drh -Z f5a439caf79133298419241dae122f4e +Z fa645aebf1d7fefe7cb4cc20303fc9e2 diff --git a/manifest.uuid b/manifest.uuid index 2e856727c0..5eb83b599d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b92d31a97d5fe4606d9ae1393c7f3e052f46bf5a \ No newline at end of file +b287520c9226f7a9fab98142f5c207bfe959cd7e \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 002309bc3b..966d0431d0 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -1909,7 +1909,7 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ MemSetTypeFlag(pOut, MEM_Null); REGISTER_TRACE(pOp->p2, pOut); }else{ - VdbeBranchTaken((pOp->p5 & SQLITE_JUMPIFNULL)?2:3,4); + VdbeBranchTaken(2,3); if( pOp->p5 & SQLITE_JUMPIFNULL ){ pc = pOp->p2-1; } @@ -1946,7 +1946,7 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ pOut->u.i = res; REGISTER_TRACE(pOp->p2, pOut); }else{ - VdbeBranchTaken(res!=0, 4); + VdbeBranchTaken(res!=0, (pOp->p5 & SQLITE_NULLEQ)?2:3); if( res ){ pc = pOp->p2-1; }