Change some debugging #defines in order to get SSE working again after

recent upgrades. (CVS 2719)

FossilOrigin-Name: 86eb7d8363559c94bfcd7e48ff6270025ecacb7b

diff --git a/manifest b/manifest
index 684c5d9e8fb312203ba682a13cad6a302a46ece9..6bb8d36257502dfde20078c8ac25209a66cdb6b6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Download\spage\sreports\ssizes\sin\sMiB\sand\sKiB\sinstead\sof\sjust\sbytes.\s(CVS\s2718)
-D 2005-09-17T19:28:46
+C Change\ssome\sdebugging\s#defines\sin\sorder\sto\sget\sSSE\sworking\sagain\safter\nrecent\supgrades.\s(CVS\s2719)
+D 2005-09-19T12:37:28
 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 b569b60e35f0e3ea20e5ebfaf6e522a01c08d481
+F src/test1.c 8ae32b32c80563b5481702646c1db2eca63e2c42
 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 1cc55c9aa142c7ef09b427f5fd0bf0488e365fc4
+F src/where.c 2e17f49ad0705a308ad52d676cfdce7e8e845e2b
 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 91bc0d0032d5305671da0ebfc6e697b9b882f1ad
-R ff0139107a70910902346049e88a48c7
+P e985f02d20d50b0451bfd35a7343e0386336dd71
+R d12af548fed89b4a734aabfc84ed6d57
 U drh
-Z 56f8c51b415281e73290ccca2e172dec
+Z 42aa55fc0ffa448898335fa048bb4038

diff --git a/manifest.uuid b/manifest.uuid
index ff257dc599959dd78fbb21fa400d080c173a1857..8932f999e67a93fada4471e7884e22dea88e57b3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e985f02d20d50b0451bfd35a7343e0386336dd71
\ No newline at end of file
+86eb7d8363559c94bfcd7e48ff6270025ecacb7b
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index c685560772b6499936666d1993ab2c27324a1c70..0f0d26da495ea397590f9420b03bc5e5c13f149d 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.160 2005/09/06 21:40:45 drh Exp $
+** $Id: test1.c,v 1.161 2005/09/19 12:37:28 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -3187,8 +3187,8 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
 #endif
 #ifdef SQLITE_DEBUG
   extern int sqlite3_vdbe_addop_trace;
-#endif
   static char *query_plan = sqlite3_query_plan;
+#endif
 
   for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){
     Tcl_CreateCommand(interp, aCmd[i].zName, aCmd[i].xProc, 0, 0);
@@ -3211,8 +3211,6 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
       (char*)&sqlite3_current_time, TCL_LINK_INT);
   Tcl_LinkVar(interp, "sqlite_os_trace",
       (char*)&sqlite3_os_trace, TCL_LINK_INT);
-  Tcl_LinkVar(interp, "sqlite_where_trace",
-      (char*)&sqlite3_where_trace, TCL_LINK_INT);
 #if OS_WIN
   Tcl_LinkVar(interp, "sqlite_os_type",
       (char*)&sqlite3_os_type, TCL_LINK_INT);
@@ -3220,6 +3218,10 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
 #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
 #ifdef SQLITE_MEMDEBUG
   Tcl_LinkVar(interp, "sqlite_memused",
@@ -3227,8 +3229,6 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   Tcl_LinkVar(interp, "sqlite_memmax",
       (char*)&sqlite3_memMax, TCL_LINK_INT | TCL_LINK_READ_ONLY);
 #endif
-  Tcl_LinkVar(interp, "sqlite_query_plan",
-      (char*)&query_plan, TCL_LINK_STRING|TCL_LINK_READ_ONLY);
 #ifndef SQLITE_OMIT_DISKIO
   Tcl_LinkVar(interp, "sqlite_opentemp_count",
       (char*)&sqlite3_opentemp_count, TCL_LINK_INT);

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