Fix an issue that was causing ORDER BY DESC to come out in ascending order.

FossilOrigin-Name: 029840124022387a8f6d2e1a685a003688d0ef3a

diff --git a/manifest b/manifest
index ba3a0060245a76d06382b8115f0885df3bb89038..34d692d6a5408508f9ad46f9be300ba58da6c581 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Virtual\stables\snow\salways\sreport\s25\srows\sinstead\sof\s0\srows\sin\sthe\s\nEXPLAIN\sQUERY\sPLAN\soutput.\s\sAdjust\stests\saccordingly.
-D 2013-06-03T15:24:11.404
+C Fix\san\sissue\sthat\swas\scausing\sORDER\sBY\sDESC\sto\scome\sout\sin\sascending\sorder.
+D 2013-06-03T15:34:48.695
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 7e34bb26affb2bf0eee8a8c5ab955cf80e7f9580
+F src/where.c 078c3aeafacf8544bdc733bf6b60d087d9e6346c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1093,7 +1093,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 510f4d8ecf6eb284f14b91951e7236505bd71203
-R b46e673a11585c0adf84b26ffd5c9ca9
+P 7d91f688815597ff65ec04b7daa21cb9e5d6bf98
+R 47cac5b8ea3311240b582844f809143b
 U drh
-Z 24bffcc0033c051bdc90970a04c0eaf7
+Z d1b03d3fcac2015c05c39b44e5780b67

diff --git a/manifest.uuid b/manifest.uuid
index f196f60bd262e1d8484670e5171a215ecfe3411d..fa405a84b7a52b4d9916ee578c1280c41e95ee04 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d91f688815597ff65ec04b7daa21cb9e5d6bf98
\ No newline at end of file
+029840124022387a8f6d2e1a685a003688d0ef3a
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 1efa409942dbf24c85d67cd0c03fd58e5cd7b11f..d9e33d6058a6c2d475a24c9e3101f2b333ad5deb 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4767,6 +4767,8 @@ static int wherePathSolver(WhereInfo *pWInfo, double nRowEst){
             default: /* Cannot tell yet.  Try again on the next iteration */
               break;
           }
+        }else{
+          revMask = pFrom->revLoop;
         }
         /* Check to see if pWLoop should be added to the mxChoice best so far */
         for(jj=0, pTo=aTo; jj<nTo; jj++, pTo++){