From: drh Date: Tue, 12 Mar 2013 18:49:25 +0000 (+0000) Subject: Revise the patch to make it easier to understand. X-Git-Tag: version-3.7.16~2^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d383216383fdea13fbeb972859bce9622897f88d;p=thirdparty%2Fsqlite.git Revise the patch to make it easier to understand. FossilOrigin-Name: 3ce7eb0265b5be4e23264ae41332b947011ff1ad --- diff --git a/manifest b/manifest index 923a152b6d..20c07b237f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stest\scases\sfor\s[4dd95f6943]. -D 2013-03-12T18:44:49.167 +C Revise\sthe\spatch\sto\smake\sit\seasier\sto\sunderstand. +D 2013-03-12T18:49:25.514 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -252,7 +252,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83 F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2 F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6 F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b -F src/where.c 6c2940f1fabea37d06a80770d2ad71971cf712b5 +F src/where.c 494da8b32d3d616cf82de5fde00bd9e05a827927 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6 @@ -1038,7 +1038,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P 8b2eb7a43b4580f04c14ea8600cf080e0e7f384d -R 9034788cece44d65e62540f59178537b -U dan -Z 993779e9755bd8c64570dcd5012e8aeb +P 723c144c76fc171e5d19072d6d42a08013921ec6 +R 8845ff38c1d7ead5133653a3959bc6c8 +U drh +Z d1fe748b8afa7deacbc6c45434b31b72 diff --git a/manifest.uuid b/manifest.uuid index a1e9dda464..1574cb12d2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -723c144c76fc171e5d19072d6d42a08013921ec6 \ No newline at end of file +3ce7eb0265b5be4e23264ae41332b947011ff1ad \ No newline at end of file diff --git a/src/where.c b/src/where.c index e1cc7a1837..a424779a41 100644 --- a/src/where.c +++ b/src/where.c @@ -3794,14 +3794,13 @@ static int codeEqualityTerm( int eType; int iTab; struct InLoop *pIn; - u8 bRev; + u8 bRev = (pLevel->plan.wsFlags & WHERE_REVERSE)!=0; - if( (pLevel->plan.wsFlags & WHERE_INDEXED)!=0 ){ - bRev = pLevel->plan.u.pIdx->aSortOrder[iEq]; - }else{ - bRev = 0; + if( (pLevel->plan.wsFlags & WHERE_INDEXED)!=0 + && pLevel->plan.u.pIdx->aSortOrder[iEq] + ){ + bRev = 1 - bRev; } - if( pLevel->plan.wsFlags & WHERE_REVERSE ) bRev = 1 - bRev; assert( pX->op==TK_IN ); iReg = iTarget; eType = sqlite3FindInIndex(pParse, pX, 0);