Additional information about index sorting in EXPLAIN QUERY PLAN. (CVS 3176)

FossilOrigin-Name: 39dd969527a107b2a6bb94dfc35d93850917faa8

diff --git a/manifest b/manifest
index 43658c400aae039aece8066223b3e941ced9bbae..94b4935af6c19de4b59a140cf6227aab6c473bd3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\ssuperfluous\scall\sto\saccess()\sin\sthe\sunix\sdriver.\s\sError\sspotted\nby\sCoverity.\s(CVS\s3175)
-D 2006-04-19T01:24:53
+C Additional\sinformation\sabout\sindex\ssorting\sin\sEXPLAIN\sQUERY\sPLAN.\s(CVS\s3176)
+D 2006-04-21T09:38:37
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -96,7 +96,7 @@ F src/vdbeapi.c 7dc662e7c905ce666bb506dced932e0307115cbf
 F src/vdbeaux.c 4002e6b19d7c9719cb81f9797316b9ad118e4370
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
-F src/where.c 1ba8eb02aba7eb8b75d7be0635200a14f0bef73a
+F src/where.c dc626f8c0fcff56ab7b08c9fb579d8ac33b0fbd9
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test b854de90f530ae37be68fbfe6de40e111358cbb2
 F test/all.test 5df90d015ca63fcef2a4b62c24f7316b66c4bfd4
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 2a0120c0f06d17185ede773729d97c93f90923ff
-R bbc3e7076a63308418057690860dfefb
+P 4f195aa1ebef5129e6f912e78b3d5f97b393a06c
+R 1d51f3db2675653f28e6c7760e84e07b
 U drh
-Z 3cf4dbb6bb7d078e42f81cc335b564c2
+Z a42ec39a3feaf08b8a5c7649ab713fe5

diff --git a/manifest.uuid b/manifest.uuid
index 8563711ba69d8ae560b57ec1a8fbc441977978a1..c1591f3a1586b0d930f0c49d777944c1a92e7d8f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f195aa1ebef5129e6f912e78b3d5f97b393a06c
\ No newline at end of file
+39dd969527a107b2a6bb94dfc35d93850917faa8
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index d1ff00f9dafc9c7a64d2e0e34365407d9b9cfebc..1c156c2180ca5c2ad92c6443aad9c02debdaa36a 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.206 2006/03/28 23:55:58 drh Exp $
+** $Id: where.c,v 1.207 2006/04/21 09:38:37 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1593,6 +1593,9 @@ WhereInfo *sqlite3WhereBegin(
       }else if( pLevel->flags & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){
         zMsg = sqlite3MPrintf("%z USING PRIMARY KEY", zMsg);
       }
+      if( pLevel->flags & WHERE_ORDERBY ){
+        zMsg = sqlite3MPrintf("%z ORDER BY", zMsg);
+      }
       sqlite3VdbeOp3(v, OP_Explain, i, pLevel->iFrom, zMsg, P3_DYNAMIC);
     }
 #endif /* SQLITE_OMIT_EXPLAIN */