diff --git a/manifest b/manifest
index e14188c6f9..f587e7e535 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sremark\sin\sthe\schangelog\sthat\smentions\s64-bit\salignment\sfixes\sin\s3.2.2.\s(CVS\s2547)
-D 2005-07-09T23:11:22
+C Add\stest\sinstrumentation\sthat\swill\sbe\sneeded\sduring\sthe\sdevelopment\sof\nforthcoming\soptimizer\senhancements.\s(CVS\s2548)
+D 2005-07-15T13:05:21
 F Makefile.in 22ea9c0fe748f591712d8fe3c6d972c6c173a165
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -44,7 +44,7 @@ F src/hash.c 2b1b13f7400e179631c83a1be0c664608c8f021f
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
 F src/insert.c c4533240451b73ead88098b5d819cb70fa0880bd
 F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b
-F src/main.c fcf2fc29a32cdfa69994e411618664d421aa64bd
+F src/main.c 568005dc335c17bf1f7ce346652c1c505f412fd7
 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
 F src/os.h c4b34bd4d6fea51a420f337468b907f4edecb161
 F src/os_common.h 0e7f428ba0a6c40a61bc56c4e96f493231301b73
@@ -67,7 +67,7 @@ F src/sqlite.h.in 838382ed6b48d392366a55e07f49d9d71263e1fe
 F src/sqliteInt.h af65e8fac1fe8f6f78a65551081bafd49f6e0650
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c cccaf6b78c290d824cf8ea089b8b27377e545830
-F src/test1.c 83ead44dead55033adff61ce69a1e2fc3e72935e
+F src/test1.c 889257e281064952943d54fd7c2f86d52e36cbbe
 F src/test2.c 716c1809dba8e5be6093703e9cada99d627542dc
 F src/test3.c 683e1e3819152ffd35da2f201e507228921148d0
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
@@ -85,7 +85,7 @@ F src/vdbeapi.c 7f392f0792d1258c958083d7de9eae7c3530c9a6
 F src/vdbeaux.c 3732a86566a6be4da4c606e9334baf3fd98667af
 F src/vdbefifo.c b8805850afe13b43f1de78d58088cb5d66f88e1e
 F src/vdbemem.c da8e8d6f29dd1323f782f000d7cd120027c9ff03
-F src/where.c 6326f643534a2585a3bbbfe490a39dc4fa1115a5
+F src/where.c 878bf7f2e155ce56dec0e1401740e3c4b9ed0c96
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 9d6837a3d946b73df692b7cef2a7644d2e2f6bc6
@@ -286,7 +286,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P e050af70adcdac8f9c9d8cffd1658f7fb2ebd362
-R 662b3e0396bacd3777004bbd43bcb29b
+P ead583cfad7c6ea84c3685d89f40104f4d33bc81
+R 3e8a508676bc28d1b35000f20bc57673
 U drh
-Z 5a79737ab58b3791b9922a49f322e864
+Z 8bf5cdb836c3940fc9c9b2f203ba626d
diff --git a/manifest.uuid b/manifest.uuid
index 391299f380..ecd39a1179 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ead583cfad7c6ea84c3685d89f40104f4d33bc81
\ No newline at end of file
+dfd5fd77b0764853f847eeee3c1fe047d60fee7e
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index a143d78895..0d363f51c2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.295 2005/07/09 02:16:03 drh Exp $
+** $Id: main.c,v 1.296 2005/07/15 13:05:21 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -550,11 +550,11 @@ void *sqlite3_commit_hook(
 ** opened and used.  If zFilename is the magic name ":memory:" then
 ** the database is stored in memory (and is thus forgotten as soon as
 ** the connection is closed.)  If zFilename is NULL then the database
-** is for temporary use only and is deleted as soon as the connection
-** is closed.
+** is a "virtual" database for transient use only and is deleted as
+** soon as the connection is closed.
 **
-** A temporary database can be either a disk file (that is automatically
-** deleted when the file is closed) or a set of red-black trees held in memory,
+** A virtual database can be either a disk file (that is automatically
+** deleted when the file is closed) or it an be held entirely in memory,
 ** depending on the values of the TEMP_STORE compile-time macro and the
 ** db->temp_store variable, according to the following chart:
 **
diff --git a/src/test1.c b/src/test1.c
index e32fedf5e0..f342b5aacc 100644
--- 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.147 2005/07/08 12:13:05 drh Exp $
+** $Id: test1.c,v 1.148 2005/07/15 13:05:21 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -3093,6 +3093,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   extern int sqlite3_os_trace;
   extern int sqlite3_sync_count, sqlite3_fullsync_count;
   extern int sqlite3_opentemp_count;
+  extern char sqlite3_query_plan[];
 
   for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){
     Tcl_CreateCommand(interp, aCmd[i].zName, aCmd[i].xProc, 0, 0);
@@ -3113,6 +3114,8 @@ 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_query_plan",
+      sqlite3_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 14f3919004..67e6d7c26d 100644
--- 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.142 2005/07/08 17:13:47 drh Exp $
+** $Id: where.c,v 1.143 2005/07/15 13:05:21 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -511,6 +511,19 @@ static void codeEqualityTerm(
 */
 #define BMS  (sizeof(Bitmask)*8-1)
 
+#ifdef SQLITE_TEST
+/*
+** The following variable holds a text description of query plan generated
+** by the most recent call to sqlite3WhereBegin().  Each call to WhereBegin
+** overwrites the previous.  This information is used for testing and
+** analysis only.
+*/
+char sqlite3_query_plan[BMS*2*40];  /* Text of the join */
+static int nQPlan = 0;              /* Next free slow in _query_plan[] */
+
+#endif /* SQLITE_TEST */
+
+
 
 /*
 ** Generate the beginning of the loop used for WHERE clause processing.
@@ -951,9 +964,49 @@ WhereInfo *sqlite3WhereBegin(
       sqlite3VdbeAddOp(v, OP_SetNumColumns, iIdxCur, pIx->nColumn+1);
     }
     sqlite3CodeVerifySchema(pParse, pTab->iDb);
+
+#ifdef SQLITE_TEST
+    /* Record in the query plan information about the current table
+    ** and the index used to access it (if any).  If the table itself
+    ** is not used, its name is followed by '*'.  If no index is used
+    ** the index is listed as "{}"
+    */
+    {
+      int n = strlen(pTab->zName);
+      if( n+nQPlan < sizeof(sqlite3_query_plan)-10 ){
+        strcpy(&sqlite3_query_plan[nQPlan], pTab->zName);
+        nQPlan += n;
+        if( (pLevel->score & 1)==0 ){
+          sqlite3_query_plan[nQPlan++] = '*';
+        }
+        sqlite3_query_plan[nQPlan++] = ' ';
+      }
+      if( pIx==0 ){
+        strcpy(&sqlite3_query_plan[nQPlan], " {}");
+        nQPlan += 3;
+      }else{
+        n = strlen(pIx->zName);
+        if( n+nQPlan < sizeof(sqlite3_query_plan)-2 ){
+          strcpy(&sqlite3_query_plan[nQPlan], pIx->zName);
+          nQPlan += n;
+          sqlite3_query_plan[nQPlan++] = ' ';
+        }
+      }
+    }
+#endif
   }
   pWInfo->iTop = sqlite3VdbeCurrentAddr(v);
 
+#ifdef SQLITE_TEST
+  /* Terminate the query plan description
+  */
+  while( nQPlan>0 && sqlite3_query_plan[nQPlan-1]==' ' ){
+    sqlite3_query_plan[--nQPlan] = 0;
+  }
+  sqlite3_query_plan[nQPlan] = 0;
+  nQPlan = 0;
+#endif
+
   /* Generate the code to do the search
   */
   loopMask = 0;