The sqlite3_query_plan debugging variable now only appears with SQLITE_TEST=1. (CVS...

FossilOrigin-Name: 41e226d2ff5c0021fd07388da13f6d750fac508b

diff --git a/manifest b/manifest
index 34c68119ae858ad88624b53217f24e322debdda8..922786ce90e239dd323397a6873ad0b5b00fbf8b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\saround\slimitations\sof\sMSVC++\s6.\s\sTickets\s#1429,\s#1437,\sand\s#1440.\s(CVS\s2720)
-D 2005-09-19T12:53:19
+C The\ssqlite3_query_plan\sdebugging\svariable\snow\sonly\sappears\swith\sSQLITE_TEST=1.\s(CVS\s2721)
+D 2005-09-19T13:15:23
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -69,7 +69,7 @@ F src/sqlite.h.in 461b2535550cf77aedfd44385da11ef7d63e57a2
 F src/sqliteInt.h cc5874662b2b3236e2d70a23429561b9f469c423
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c ac94682f9e601dd373912c46414a5a842db2089a
-F src/test1.c 8ae32b32c80563b5481702646c1db2eca63e2c42
+F src/test1.c 0f1a66f65a54fba029f7e93b7500d49443dc959b
 F src/test2.c 4196848c845626e7df894470f27329e80bfe92aa
 F src/test3.c f4e6a16a602091696619a1171bda25c0e3df49f7
 F src/test4.c a8fd681e139e1c61f22a77d07fc3a99cb28fff3f
@@ -87,7 +87,7 @@ F src/vdbeapi.c 85bbe1d0243a89655433d60711b4bd71979b59cd
 F src/vdbeaux.c 57a6ced8417bdc6f06c391d9c560ecbbed644ef3
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c fea0744936008831daa17cdc75056c3ca1469690
-F src/where.c 2e17f49ad0705a308ad52d676cfdce7e8e845e2b
+F src/where.c 728051085e8c782370a00ab36b494a244b1e9f4e
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 9d6837a3d946b73df692b7cef2a7644d2e2f6bc6
@@ -309,7 +309,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 86eb7d8363559c94bfcd7e48ff6270025ecacb7b
-R 15fcd6b3781cf3f7264e2518cef646b9
+P b2d1803c25b0b823c9cbe27989bacb730b18b45b
+R 5e74f6a85297c7ad6c94b75749d66e16
 U drh
-Z 03ff42266003329b3962c81a45454f89
+Z 1554e437ada1f4b93fe0cb919fe0dc5d

diff --git a/manifest.uuid b/manifest.uuid
index 6cfa4ecd6190a4833418330b96892f404cb3e0f4..854a445e775ea844012b6b56893f85d0c2e41d2e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b2d1803c25b0b823c9cbe27989bacb730b18b45b
\ No newline at end of file
+41e226d2ff5c0021fd07388da13f6d750fac508b
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 0f0d26da495ea397590f9420b03bc5e5c13f149d..29af5b6d64d271b7c98879e5973a9f1f64eaa5d0 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.161 2005/09/19 12:37:28 drh Exp $
+** $Id: test1.c,v 1.162 2005/09/19 13:15:23 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -3180,13 +3180,15 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   extern int sqlite3_opentemp_count;
   extern int sqlite3_memUsed;
   extern int sqlite3_memMax;
-  extern char sqlite3_query_plan[];
   extern int sqlite3_like_count;
 #if OS_WIN
   extern int sqlite3_os_type;
 #endif
 #ifdef SQLITE_DEBUG
   extern int sqlite3_vdbe_addop_trace;
+#endif
+#ifdef SQLITE_TEST
+  extern char sqlite3_query_plan[];
   static char *query_plan = sqlite3_query_plan;
 #endif
 
@@ -3215,11 +3217,13 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   Tcl_LinkVar(interp, "sqlite_os_type",
       (char*)&sqlite3_os_type, TCL_LINK_INT);
 #endif
+#ifdef SQLITE_TEST
+  Tcl_LinkVar(interp, "sqlite_query_plan",
+      (char*)&query_plan, TCL_LINK_STRING|TCL_LINK_READ_ONLY);
+#endif
 #ifdef SQLITE_DEBUG
   Tcl_LinkVar(interp, "sqlite_addop_trace",
       (char*)&sqlite3_vdbe_addop_trace, TCL_LINK_INT);
-  Tcl_LinkVar(interp, "sqlite_query_plan",
-      (char*)&query_plan, TCL_LINK_STRING|TCL_LINK_READ_ONLY);
   Tcl_LinkVar(interp, "sqlite_where_trace",
       (char*)&sqlite3_where_trace, TCL_LINK_INT);
 #endif

diff --git a/src/where.c b/src/where.c
index 7b36806fc16bcebd46f1ba4ad0d9650f8149832e..12590557dcf83dadea7317d0df39f65f0f59ed38 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.175 2005/09/19 12:37:28 drh Exp $
+** $Id: where.c,v 1.176 2005/09/19 13:15:23 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1264,7 +1264,7 @@ static void codeAllEqualityTerms(
   }
 }
 
-#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
+#if defined(SQLITE_TEST)
 /*
 ** The following variable holds a text description of query plan generated
 ** by the most recent call to sqlite3WhereBegin().  Each call to WhereBegin