Fix an unnecessarily obtuse use of a bitmask flag.

FossilOrigin-Name: ca3140813198ab7ce470cf86334e55207f3461f9

diff --git a/manifest b/manifest
index 8ad063c93842466f2c0f638eef57925a9acefb19..41cb481776a8676c30fe19b055266d80e564f0f3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\ssome\sunnecessary\scalls\sto\ssqlite3VdbeRecordUnpack()\sthat\swere\sbeing\smade\swhen\smerging\sdata\sfrom\stwo\sor\smore\stemp\sfiles\stogether\sin\svdbesort.c
-D 2014-03-19T20:01:25.712
+C Fix\san\sunnecessarily\sobtuse\suse\sof\sa\sbitmask\sflag.
+D 2014-03-20T12:17:35.051
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -291,7 +291,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c bb50b5aed4f9b2284eb92c944253e60df2fb8259
+F src/where.c e433accd201ca482c761e679f4a2ce2f6a7348e6
 F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1156,7 +1156,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 ecd9d3f9453be0bb8e312d8027fd1a9e55882f36
-R 597feeb3c9b32d5be1e5c696f1b077da
-U dan
-Z 03e3772c0627172d43f05f231b29ede3
+P 707ea170b3e26965b7e3982f7554d122d130b9a6
+R 829b1d227d22721b3fefbad8e2ead1b7
+U drh
+Z fcfbdaafabd38e7e728b08b0509fc847

diff --git a/manifest.uuid b/manifest.uuid
index 5d0bb22e62c55c1c15675497c3f6a69c12a72123..444963914a24a7d883d97262dd51148053343878 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-707ea170b3e26965b7e3982f7554d122d130b9a6
\ No newline at end of file
+ca3140813198ab7ce470cf86334e55207f3461f9
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 6cd9c167a19f43565386765d8f60414ef98e3274..d13258ad66594ef32ffa060bff7b23a36565549c 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3208,8 +3208,7 @@ static Bitmask codeOneLoopStart(
       pLevel->op = OP_Next;
     }
     pLevel->p1 = iIdxCur;
-    assert( (WHERE_UNQ_WANTED>>16)==1 );
-    pLevel->p3 = (pLoop->wsFlags>>16)&1;
+    pLevel->p3 = (pLoop->wsFlags&WHERE_UNQ_WANTED)!=0 ? 1:0;
     if( (pLoop->wsFlags & WHERE_CONSTRAINT)==0 ){
       pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
     }else{