Always enable WHERE-tracing on a test build.

Oops - accidentally included a debugging change to pragma.c in
this check-in.  The real fix for the pragma problem is in the
following checking. (CVS 6458)

FossilOrigin-Name: 567cf90b038a37da93d02954ef8f9f435dcc9a38

diff --git a/manifest b/manifest
index 64aa71014f1faf8858fe63b29fe018a50917569d..a1d10718a478cfd27eb33165630ac963f9025476 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C It\sis\sOK\sfor\sa\sunix\sfile\sdescriptor\sto\sbe\szero.\s\sIt\sjust\scan't\sbe\snegative.\nAdjust\san\sassert\saccordingly.\s\sTicket\s#3781.\s(CVS\s6457)
-D 2009-04-07T00:35:20
+C Always\senable\sWHERE-tracing\son\sa\stest\sbuild.\r\nOops\s-\saccidentally\sincluded\sa\sdebugging\schange\sto\spragma.c\sin\s\r\nthis\scheck-in.\s\sThe\sreal\sfix\sfor\sthe\spragma\sproblem\sis\sin\sthe\r\nfollowing\schecking.\s(CVS\s6458)
+D 2009-04-07T00:43:28
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -149,7 +149,7 @@ F src/parse.y b7e4341b21736a90b952aa6bb663ec98529b778e
 F src/pcache.c 395f752a13574120bd7513a400ba02a265aaa76d
 F src/pcache.h 9b927ccc5a538e31b4c3bc7eec4f976db42a1324
 F src/pcache1.c f587565f4ba0fd1772067eaa96814dce761b7a4c
-F src/pragma.c c7a237e4dc3b1fa3d83c7da6a3e2dea8d010a0b7
+F src/pragma.c a89252bf022ca7e3291f205b4f2b730a3833c065
 F src/prepare.c 0ad1ba3290e0626aa4e7589ed6ab6af2572875b0
 F src/printf.c 9866a9a9c4a90f6d4147407f373df3fd5d5f9b6f
 F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
@@ -209,7 +209,7 @@ F src/vdbeblob.c e67757450ae8581a8b354d9d7e467e41502dfe38
 F src/vdbemem.c 9798905787baae83d0b53b62030e32ecf7a0586f
 F src/vtab.c f1aba5a6dc1f83b97a39fbbc58ff8cbc76311347
 F src/walker.c 42bd3f00ca2ef5ae842304ec0d59903ef051412d
-F src/where.c 0eeb451ecbba411fa5dacd8181244c57453bd1c8
+F src/where.c 70199494db2c13d047e9cf0d4779c70d876fb267
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 597662c5d777a122f9a3df0047ea5c5bd383a911
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P def3a016914f683818b5f013ec4efecbb8fd4c0d
-R dd09bd0133bdadedbd1d713686ab1fb9
+P 47aa7eb0e047e30bbf09cb08c1e48c61f8d9861c
+R e81d098097e2f707a36a937b786de0fc
 U drh
-Z 8bf6995ce628580cd1999c568866c0af
+Z 75554d1084ff92052371925ee3610eb2

diff --git a/manifest.uuid b/manifest.uuid
index 23aad205553a0e03ffba021f4a0d72e9062c5f2c..260db076858ef7831cd92fee9b1eda7f1dafb200 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-47aa7eb0e047e30bbf09cb08c1e48c61f8d9861c
\ No newline at end of file
+567cf90b038a37da93d02954ef8f9f435dcc9a38
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index c8768b07d108c1a5802653084ea0304c4a5db777..ce9d2939fb8f5c1c57daebead42aef1014f5cf0c 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.206 2009/04/04 16:02:32 drh Exp $
+** $Id: pragma.c,v 1.207 2009/04/07 00:43:28 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -152,7 +152,7 @@ static void returnSingleInt(Parse *pParse, const char *zLabel, i64 value){
     memcpy(pI64, &value, sizeof(value));
   }
   sqlite3VdbeAddOp4(v, OP_Int64, 0, mem, 0, (char*)pI64, P4_INT64);
-  if( pParse->explain==0 ){
+  if( /*pParse->explain==0*/ 1 ){
     sqlite3VdbeSetNumCols(v, 1);
     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, zLabel, SQLITE_STATIC);
   }

diff --git a/src/where.c b/src/where.c
index b11a96ac2f1333367425097fb059b8a2feb4606b..e7ccd2d0774b11f5e38d900216a8f50e9fe37372 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.380 2009/04/06 12:26:58 drh Exp $
+** $Id: where.c,v 1.381 2009/04/07 00:43:28 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -26,7 +26,7 @@
 #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
 int sqlite3WhereTrace = 0;
 #endif
-#if 0
+#if defined(SQLITE_TEST)
 # define WHERETRACE(X)  if(sqlite3WhereTrace) sqlite3DebugPrintf X
 #else
 # define WHERETRACE(X)