Fixed reversed labels in WHERETRACE() statement. Debugging code only. (CVS 6948)

FossilOrigin-Name: 614a8d83158eb59e3fbe78d62461635bfcc13525

diff --git a/manifest b/manifest
index a8fd892d73e97c197d716f67737d639cd3aa4c36..ae57a5120965ff079100edd27203c60f4b7ce96a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sthere\sis\sa\shot-journal\sin\sthe\sfile-system,\sa\sconnection\swith\sjournal_mode=memory\sset\smay\shave\sto\sopen\sit\sto\seffect\srollback.\sAccount\sfor\sthis\sin\spager_end_transaction().\sThis\sprevents\san\sassert\sfrom\sfailing\sin\sthe\sin-memory\sjournal\spermutation\stest.\s(CVS\s6947)
-D 2009-07-27T14:15:44
+C Fixed\sreversed\slabels\sin\sWHERETRACE()\sstatement.\s\sDebugging\scode\sonly.\s(CVS\s6948)
+D 2009-07-28T08:43:09
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -213,7 +213,7 @@ F src/vdbeblob.c a3f3e0e877fc64ea50165eec2855f5ada4477611
 F src/vdbemem.c bfc25f9ef4fa914b473303566459552bdb2e008a
 F src/vtab.c b19c4e96dcf2b89b5b2ba48e8ef624e654a59b2c
 F src/walker.c 1edca756275f158b80f20eb6f104c8d3fcc96a04
-F src/where.c bf56a85ab4f1e17f0c8060c97bd579cb8e0fa000
+F src/where.c de6ab601ee6f7a886f1380b63122883ef570a88f
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -739,7 +739,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P d486811715350f315374cc41f3d808a75d140afb
-R c5cf17c3dd0bcc2fee110e582ef5f716
-U danielk1977
-Z 6c83a38f6fa04f2929fbf170138a1885
+P 224bc69a04f4fe6d1004125847761b7842c2bfe0
+R 4ca3c5bfa0c281d0c8065c6aa9f9769d
+U shane
+Z dd29c0202db09ae4eaced40be14766c5

diff --git a/manifest.uuid b/manifest.uuid
index b0e014044fd403a1ca705da7df0a00a8715d8440..6fd29bff797c0a663ced7e2525e2686843395867 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-224bc69a04f4fe6d1004125847761b7842c2bfe0
\ No newline at end of file
+614a8d83158eb59e3fbe78d62461635bfcc13525
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 4416b8d81b0a0c4472ef1cd87376f9caebfce1d8..ca31e4518893c67ff2ce6783c5f2165c2ea90961 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.409 2009/07/24 17:58:53 danielk1977 Exp $
+** $Id: where.c,v 1.410 2009/07/28 08:43:09 shane Exp $
 */
 #include "sqliteInt.h"
 
@@ -2213,7 +2213,7 @@ static void bestBtreeIndex(
   /* Report the best result
   */
   pCost->plan.wsFlags |= eqTermMask;
-  WHERETRACE(("best index is %s, cost=%.9g, nrow=%.9g, wsFlags=%x, nEq=%d\n",
+  WHERETRACE(("best index is %s, nrow=%.9g, cost=%.9g, wsFlags=%x, nEq=%d\n",
         (pCost->plan.wsFlags & WHERE_INDEXED)!=0 ?
              pCost->plan.u.pIdx->zName : "(none)", pCost->nRow,
         pCost->rCost, pCost->plan.wsFlags, pCost->plan.nEq));