diff --git a/manifest b/manifest
index d84f25aa95..11b01c68a5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimizations\sin\sthe\shash\stable\smodule.\s(CVS\s1896)
-D 2004-08-20T14:08:51
+C Add\ssupport\sfor\snamed\swildcards\sin\sSQL\sstatements.\s(CVS\s1897)
+D 2004-08-20T16:02:39
 F Makefile.in 4a5e570a9e2d35b09c31b3cf01b78cea764ade4b
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -33,7 +33,7 @@ F src/build.c bad6652b33a447a06fca79a257f74932412fc110
 F src/date.c edff4aa851eeca8abbc737dc3933a2f0671156ce
 F src/delete.c e81545e546f6bc87d7508a93a09ca70695265af3
 F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37
-F src/expr.c f11a1e5c489bc8f5cc83b10aa80f21e85f48141e
+F src/expr.c 39ef5c141483f88c82472dbe0b5606b14d0a766d
 F src/func.c 7e2eeebe219aa612ce7a04c74ae6d57379c6656b
 F src/hash.c a97721a55440b7bea31ffe471bb2f6b4123cddd5
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
@@ -53,22 +53,22 @@ F src/os_win.c 54181eb73cb4783c4241feca9eaa490768b39008
 F src/os_win.h babd4e912967c6b09088cfe38a45e8005a07ba44
 F src/pager.c 2698653a3bd895b2156c108a37a32d240a55bb0e
 F src/pager.h 67739fe649f33be55dba522ca8a9cc4e42d14f71
-F src/parse.y 7b71425aa0a0b9483eddf8ee9b20bc94d5aa9034
+F src/parse.y 8b4cab1901900927f717d10885b7a1bd3375345b
 F src/pragma.c 5cf335adfdac453a2d03ab0c82f93847c43bea81
 F src/printf.c 17b28a1eedfe8129b05de981719306c18c3f1327
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c cbed45f4af76ad7fdfc0a0df6878b2b3827ae1d4
 F src/shell.c 42f65424a948f197f389e13bc7aaa3cf24dafd0c
-F src/sqlite.h.in 7fa206b3c7740d891d087cd87c36f6885ce03e70
+F src/sqlite.h.in de2be4043f0bfa16958d33392a3e7a5e7d4bd50b
 F src/sqliteInt.h 251662c89dd35c4ed745681ff00758d19ffd0906
 F src/table.c 4521c278892f60e4d630788c0ea5cf4db1e75c49
-F src/tclsqlite.c cece44ee1d4427185e4ac85ddec79f31ac26965a
-F src/test1.c 56e7980918737ef6c45a6cb3afeb1b23e68ed19e
+F src/tclsqlite.c d6cf0db0a491c93c1971cf7ea70cbb0656ad8ce3
+F src/test1.c 896580d200136ed369154dbf52ee76d1ebfc4b2e
 F src/test2.c f4c2f3928f1998fd8cb75a81e33a60e025ea85d4
 F src/test3.c 94d0a2a90bccd85802488cb42c69ec8afd2e4646
 F src/test4.c c38766914e924091516030b6a8b677d849c08bf0
 F src/test5.c b001fa7f1b9e2dc5c2331de62fc641b5ab2bd7a1
-F src/tokenize.c 174d24d24129206be4923582189d772a70e2634c
+F src/tokenize.c b96043fdf662d93ccfc758d3e1cdf2513f23eca2
 F src/trigger.c 360cf8f12edd4eb3a8a2895b136aac238c3cf44e
 F src/update.c b66b1896c9da54678ba3eff2bf0b4d291a95986a
 F src/utf.c 3d8f7bffcbefcced69a436c9e0a1c7eb9e0bb4fa
@@ -76,9 +76,9 @@ F src/util.c e2c631849cc9e035f6fd387f507ad8886f77cedd
 F src/vacuum.c 9978a5760c2c430bc5b5e66505a02dad76f25813
 F src/vdbe.c 281af7f601a3220e86be2152eeb2ec6d82a6f71a
 F src/vdbe.h 75b241c02431b9c0f16eaa9cdbb34146c6287f52
-F src/vdbeInt.h 3d8e08c54dcb5ca2169db8bb3a37b81a12efaecd
-F src/vdbeapi.c 3be4ccab4ba6c21d60feffc48e22cf8c1643c6d5
-F src/vdbeaux.c 892a49f7bf8c46222108d6a9ba081ac578375744
+F src/vdbeInt.h 5e57e36a03ebf09f2653caec0d9c18a904e0d060
+F src/vdbeapi.c cd8d153c77fd0c03ad746aef2fa4c61ef29955b8
+F src/vdbeaux.c cc86e59cb56dad2f9335933f71268227f5f91bce
 F src/vdbemem.c 68fefaf83adb48fe44135da01502c9327f6172b0
 F src/where.c cf8a54641eea01f1af5d09529ad69166db92f658
 F test/all.test 3b692eb43583b52c99c344b2fa8934512d179016
@@ -88,7 +88,7 @@ F test/attach3.test 6d060986ff004ebb89e1876a331d96c6bb62269e
 F test/auth.test e74b015545f608c06d5b84d17acdf7146eb818af
 F test/bigfile.test 62722ac4b420dfbcdceb137b8634e2cf2865fe27
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
-F test/bind.test 94c3df3da774b48c6946c81b1d7f1b1646e0bd46
+F test/bind.test e8132be4fa89726d4a793072cfa848ebacfc218b
 F test/blob.test 8727a7b46b2073a369cfc9bcb6f54dd366b9d884
 F test/btree.test 97b563e1ab999bf8764b129e8c4b4be0a116a52a
 F test/btree2.test aa4a6d05b1ea90b1acaf83ba89039dd302a88635
@@ -165,7 +165,7 @@ F test/sort.test 30fb9ea782a78da849a562d53233ec62d421bf61
 F test/subselect.test 8e889521c4234d8ebbe3945d91b147ed051fb9da
 F test/table.test fd9a0f4992230e4ca89cd37ae3191a12750df1d0
 F test/tableapi.test b21ab097e87a5484bb61029e69e1a4e5c5e65ede
-F test/tclsqlite.test 9bb1ee91e4ab661b3240423daaf4efff76874565
+F test/tclsqlite.test 7f2322f9ba620d0155ada2e247df75dff2d66f45
 F test/temptable.test 63a16e3ad19adf073cfbcdf7624c92ac5236522c
 F test/tester.tcl f36cc22d0532725073ca78272d7834d56dceb6d9
 F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
@@ -212,7 +212,7 @@ F www/arch2b.fig d22a2c9642d584b89d4088b1e51e2bb0f7c04bed
 F www/audit.tcl 90e09d580f79c7efec0c7d6f447b7ec5c2dce5c0
 F www/c_interface.tcl 2176519fc2bd2d2cf6fe74fd806fc2d8362de2c8
 F www/capi3.tcl 5c1cb163f4d2a54e2d0e22dcc399dd71245c8b89
-F www/capi3ref.tcl 46283326edfd0de9e6bb5425b54dc1624b8bef27
+F www/capi3ref.tcl 460ae1d1dd88560f878234a5d000336788434238
 F www/changes.tcl 8c36aab96163bbb64f5f07a12606a242c0a820f2
 F www/common.tcl f786e6be86fb2627ceb30e770e9efa83b9c67a3a
 F www/conflict.tcl fb8a2ba83746c7fdfd9e52fa7f6aaf5c422b8246
@@ -243,7 +243,7 @@ F www/tclsqlite.tcl 06a86cba4d7fc88e2bcd633b57702d3d16abebb5
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 28215096e0748b5b02776ddb4c964e0161bc0f16
-R 5607576f6316ac80134bcd33d2f77b9e
+P d5b0269e0dd7c310460a7ffc4120ed45db823ce9
+R 37b9443293b714f26179a23a9fff9794
 U drh
-Z d2ae7348c29545bbd90048ea25e77c25
+Z 5dc7be52ed3e3d2ef835f3803509271c
diff --git a/manifest.uuid b/manifest.uuid
index 7145bd5ef1..ae1583df51 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d5b0269e0dd7c310460a7ffc4120ed45db823ce9
\ No newline at end of file
+d3be0b7c5a39c02b9b2d6d85f1595d591984a569
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index a777874803..6e8a75ee47 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.155 2004/08/08 23:39:19 drh Exp $
+** $Id: expr.c,v 1.156 2004/08/20 16:02:39 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1162,6 +1162,9 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
     }
     case TK_VARIABLE: {
       sqlite3VdbeAddOp(v, OP_Variable, pExpr->iTable, 0);
+      if( pExpr->token.n>1 ){
+        sqlite3VdbeChangeP3(v, -1, pExpr->token.z, pExpr->token.n);
+      }
       break;
     }
     case TK_LT:
diff --git a/src/parse.y b/src/parse.y
index 26f906cdde..528711e4c4 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.133 2004/08/19 15:12:26 drh Exp $
+** @(#) $Id: parse.y,v 1.134 2004/08/20 16:02:39 drh Exp $
 */
 %token_prefix TK_
 %token_type {Token}
@@ -558,8 +558,16 @@ expr(A) ::= FLOAT(X).        {A = sqlite3Expr(@X, 0, 0, &X);}
 expr(A) ::= STRING(X).       {A = sqlite3Expr(@X, 0, 0, &X);}
 expr(A) ::= BLOB(X).         {A = sqlite3Expr(@X, 0, 0, &X);}
 expr(A) ::= VARIABLE(X).     {
-  A = sqlite3Expr(TK_VARIABLE, 0, 0, &X);
-  if( A ) A->iTable = ++pParse->nVar;
+  Token *pToken = &X;
+  Expr *pExpr = A = sqlite3Expr(TK_VARIABLE, 0, 0, pToken);
+  if( pExpr ){
+    if( pToken->z[0]==':' ){
+      int n = pExpr->iTable = atoi(&pToken->z[1]);
+      if( pParse->nVar<n ) pParse->nVar = n;
+    }else{
+      pExpr->iTable = ++pParse->nVar;
+    }
+  }
 }
 expr(A) ::= ID(X) LP exprlist(Y) RP(E). {
   A = sqlite3ExprFunction(Y, &X);
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index bb7bc9d012..270f135090 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.113 2004/08/14 17:10:12 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.114 2004/08/20 16:02:39 drh Exp $
 */
 #ifndef _SQLITE_H_
 #define _SQLITE_H_
@@ -632,11 +632,17 @@ int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
 /*
 ** Return the number of wildcards in a compiled SQL statement.  This
 ** routine was added to support DBD::SQLite.
-**
-**** EXPERIMENTAL *****
 */
 int sqlite3_bind_parameter_count(sqlite3_stmt*);
 
+/*
+** Return the name of the i-th parameter.  Ordinary wildcards "?" are
+** nameless and a NULL is returned.  For wildcards of the form :N: or
+** $vvvv the complete text of the wildcard is returned.
+** NULL is returned if the index is out of range.
+*/
+const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
+
 /*
 ** Return the number of columns in the result set returned by the compiled
 ** SQL statement. This routine returns 0 if pStmt is an SQL statement
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index ab6821e6f5..33f741d1c9 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,11 +11,12 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.98 2004/07/26 12:24:23 drh Exp $
+** $Id: tclsqlite.c,v 1.99 2004/08/20 16:02:39 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
 #include "sqliteInt.h"
+#include "hash.h"
 #include "tcl.h"
 #include <stdlib.h>
 #include <string.h>
@@ -58,8 +59,9 @@ struct SqlCollate {
 ** that has been opened by the SQLite TCL interface.
 */
 typedef struct SqliteDb SqliteDb;
+typedef struct SqlStmt SqlStmt;
 struct SqliteDb {
-  sqlite *db;           /* The "real" database structure */
+  sqlite3 *db;          /* The "real" database structure */
   Tcl_Interp *interp;   /* The interpreter used for this database */
   char *zBusy;          /* The busy callback routine */
   char *zCommit;        /* The commit hook callback routine */
@@ -70,21 +72,19 @@ struct SqliteDb {
   SqlCollate *pCollate; /* List of SQL collation functions */
   int rc;               /* Return code of most recent sqlite3_exec() */
   Tcl_Obj *pCollateNeeded;  /* Collation needed script */
+  SqlStmt *pStmtList;   /* List of all prepared statements */
 };
 
 /*
-** An instance of this structure passes information thru the sqlite
-** logic from the original TCL command into the callback routine.
+** Each prepared statement is an instance of the following structure.
 */
-typedef struct CallbackData CallbackData;
-struct CallbackData {
-  Tcl_Interp *interp;       /* The TCL interpreter */
-  char *zArray;             /* The array into which data is written */
-  Tcl_Obj *pCode;           /* The code to execute for each row */
-  int once;                 /* Set for first callback only */
-  int tcl_rc;               /* Return code from TCL script */
-  int nColName;             /* Number of entries in the azColName[] array */
-  char **azColName;         /* Column names translated to UTF-8 */
+struct SqlStmt {
+  SqliteDb *pDb;        /* The database that this statement is part of */
+  SqlStmt *pAll;        /* Next statement in list of all for pDb */
+  SqlStmt **ppPrev;     /* Previous pAll pointer */
+  sqlite3_stmt *pVm;    /* Compiled statement. */
+  int nBind;            /* Number of bindings in this statement */
+  char *azBindVar[1];   /* Name of variables for each binding */
 };
 
 /*
@@ -117,10 +117,17 @@ static int DbEvalCallback3(
 }
 
 /*
-** Called when the command is deleted.
+** TCL calls this procedure when an sqlite3 database command is
+** deleted.
 */
 static void DbDeleteCmd(void *db){
   SqliteDb *pDb = (SqliteDb*)db;
+  SqlStmt *pStmt, *pNextStmt;
+  for(pStmt=pDb->pStmtList; pStmt; pStmt=pNextStmt){
+    pNextStmt = pStmt->pAll;
+    sqlite3_finalize(pStmt->pVm);
+    Tcl_Free(pStmt);
+  }
   sqlite3_close(pDb->db);
   while( pDb->pFunc ){
     SqlFunc *pFunc = pDb->pFunc;
@@ -280,6 +287,7 @@ static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value **argv)
         SQLITE_TRANSIENT);
   }
 }
+
 #ifndef SQLITE_OMIT_AUTHORIZATION
 /*
 ** This is the authentication function.  It appends the authentication
@@ -696,7 +704,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
   }
    
   /*
-  **    $db eval $sql ?array {  ...code... }?
+  **    $db eval $sql ?array? ?{  ...code... }?
   **
   ** The SQL statement in $sql is evaluated.  For each row, the values are
   ** placed in elements of the array named "array" and ...code... is executed.
@@ -712,8 +720,8 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
     Tcl_Obj *pRet = Tcl_NewObj();
     Tcl_IncrRefCount(pRet);
 
-    if( objc!=5 && objc!=3 ){
-      Tcl_WrongNumArgs(interp, 2, objv, "SQL ?ARRAY-NAME CODE?");
+    if( objc<3 || objc>5 || objc==4 ){
+      Tcl_WrongNumArgs(interp, 2, objv, "SQL ?ARRAY-NAME? ?SCRIPT?");
       return TCL_ERROR;
     }
 
diff --git a/src/test1.c b/src/test1.c
index 3df370cdfc..cb61c5ad8f 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.97 2004/08/14 17:10:12 drh Exp $
+** $Id: test1.c,v 1.98 2004/08/20 16:02:39 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -1617,6 +1617,34 @@ static int test_bind_parameter_count(
   return TCL_OK;
 }
 
+/*
+** Usage:   sqlite3_bind_parameter_name  STMT  N
+**
+** Return the name of the Nth wildcard.  The first wildcard is 1.
+** An empty string is returned if N is out of range or if the wildcard
+** is nameless.
+*/
+static int test_bind_parameter_name(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  sqlite3_stmt *pStmt;
+  int i;
+
+  if( objc!=3 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "STMT N");
+    return TCL_ERROR;
+  }
+  if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR;
+  if( Tcl_GetIntFromObj(interp, objv[2], &i) ) return TCL_ERROR;
+  Tcl_SetObjResult(interp, 
+     Tcl_NewStringObj(sqlite3_bind_parameter_name(pStmt,i),-1)
+  );
+  return TCL_OK;
+}
+
 /*
 ** Usage: sqlite3_errcode DB
 **
@@ -2409,6 +2437,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      { "sqlite3_bind_text16",           test_bind_text16   ,0 },
      { "sqlite3_bind_blob",             test_bind_blob     ,0 },
      { "sqlite3_bind_parameter_count",  test_bind_parameter_count, 0},
+     { "sqlite3_bind_parameter_name",   test_bind_parameter_name,  0},
      { "sqlite3_errcode",               test_errcode       ,0 },
      { "sqlite3_errmsg",                test_errmsg        ,0 },
      { "sqlite3_errmsg16",              test_errmsg16      ,0 },
diff --git a/src/tokenize.c b/src/tokenize.c
index 401e7125f8..b15b0b1b3e 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.81 2004/08/08 23:39:19 drh Exp $
+** $Id: tokenize.c,v 1.82 2004/08/20 16:02:39 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -373,6 +373,54 @@ static int sqliteGetToken(const unsigned char *z, int *tokenType){
       *tokenType = TK_VARIABLE;
       return 1;
     }
+    case ':': {
+      for(i=1; isdigit(z[i]); i++){}
+      if( i>1 && z[i]==':' ){
+        *tokenType = TK_VARIABLE;
+        return i+1;
+      }else{
+        *tokenType = TK_ILLEGAL;
+        return i;
+      }
+    }
+    case '$': {
+      int c;
+      if( z[1]=='{' ){
+        int nBrace = 1;
+        for(i=2; (c=z[i])!=0 && nBrace; i++){
+          if( c=='{' ){
+            nBrace++;
+          }else if( c=='}' ){
+            nBrace--;
+          }
+        }
+        *tokenType = c!=0 ? TK_VARIABLE : TK_ILLEGAL;
+      }else{
+        int n = 0;
+        for(i=1; (c=z[i])!=0; i++){
+          if( isalnum(c) || c=='_' ){
+            n++;
+          }else if( c=='(' && n>0 ){
+            do{
+              i++;
+            }while( (c=z[i])!=0 && !isspace(c) && c!=')' );
+            if( c==')' ){
+              i++;
+              *tokenType = TK_VARIABLE;
+            }else{
+              *tokenType = TK_ILLEGAL;
+            }
+            break;
+          }else if( c==':' && z[i+1]==':' ){
+            i++;
+          }else{
+            *tokenType = n==0 ? TK_ILLEGAL : TK_VARIABLE;
+            break;
+          }
+        }
+      }
+      return i;
+    } 
     case 'x': case 'X': {
       if( z[1]=='\'' || z[1]=='"' ){
         int delim = z[1];
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 72f528a28b..c010b572c4 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -316,6 +316,8 @@ struct Vdbe {
   char **azField;     /* Data for each file field */
   int nVar;           /* Number of entries in apVar[] */
   Mem *apVar;         /* Values for the OP_Variable opcode. */
+  char **azVar;       /* Name of variables */
+  int okVar;          /* True if azVar[] has been initialized */
   char *zLine;            /* A single line from the input file */
   int nLineAlloc;         /* Number of spaces allocated for zLine */
   int magic;              /* Magic number for sanity checking */
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 8c8c27816f..09a1006b32 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -518,9 +518,32 @@ int sqlite3_bind_text16(
 /*
 ** Return the number of wildcards that can be potentially bound to.
 ** This routine is added to support DBD::SQLite.  
-**
-******** EXPERIMENTAL *******
 */
 int sqlite3_bind_parameter_count(sqlite3_stmt *pStmt){
   return ((Vdbe*)pStmt)->nVar;
 }
+
+/*
+** Return the name of a wildcard parameter.  Return NULL if the index
+** is out of range or if the wildcard is unnamed.
+**
+** The result is always UTF-8.
+*/
+const char *sqlite3_bind_parameter_name(sqlite3_stmt *pStmt, int i){
+  Vdbe *p = (Vdbe*)pStmt;
+  if( i<1 || i>p->nVar ){
+    return 0;
+  }
+  if( !p->okVar ){
+    int j;
+    Op *pOp;
+    for(j=0, pOp=p->aOp; j<p->nOp; j++, pOp++){
+      if( pOp->opcode==OP_Variable ){
+        assert( pOp->p1>0 && pOp->p1<=p->nVar );
+        p->azVar[pOp->p1-1] = pOp->p3;
+      }
+    }
+    p->okVar = 1;
+  }
+  return p->azVar[i-1];
+}
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 012159b170..9e72062053 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -574,9 +574,12 @@ void sqlite3VdbeMakeReady(
     p->aStack = sqliteMalloc(
       n*(sizeof(p->aStack[0])+sizeof(Mem*))          /* aStack, apArg */
       + p->nVar*sizeof(Mem)                          /* apVar */
+      + p->nVar*sizeof(char*)                        /* apVarName */
     );
     p->apArg = (Mem **)&p->aStack[n];
     p->apVar = (Mem *)&p->apArg[n];
+    p->azVar = (char**)&p->apVar[p->nVar];
+    p->okVar = 0;
     for(n=0; n<p->nVar; n++){
       p->apVar[n].flags = MEM_Null;
     }
diff --git a/test/bind.test b/test/bind.test
index 5b548b9213..7537ddf3d3 100644
--- a/test/bind.test
+++ b/test/bind.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the sqlite_bind API.
 #
-# $Id: bind.test,v 1.15 2004/07/15 14:15:02 drh Exp $
+# $Id: bind.test,v 1.16 2004/08/20 16:02:39 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -38,12 +38,21 @@ do_test bind-1.1 {
   db close
   set DB [sqlite3 db test.db]
   execsql {CREATE TABLE t1(a,b,c)}
-  set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES(?,?,?)} -1 TAIL]
+  set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES(:1:,?,:3:)} -1 TAIL]
   set TAIL
 } {}
 do_test bind-1.1.1 {
   sqlite3_bind_parameter_count $VM
 } 3
+do_test bind-1.1.2 {
+  sqlite3_bind_parameter_name $VM 1
+} {:1:}
+do_test bind-1.1.3 {
+  sqlite3_bind_parameter_name $VM 2
+} {}
+do_test bind-1.1.4 {
+  sqlite3_bind_parameter_name $VM 3
+} {:3:}
 do_test bind-1.2 {
   sqlite_step $VM N VALUES COLNAMES
 } {SQLITE_DONE}
@@ -91,9 +100,21 @@ do_test bind-2.1 {
   execsql {
     DELETE FROM t1;
   }
-  set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES(?,?,?)} -1 TAIL]
+  set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES($one,$::two,${x})} -1 TAIL]
   set TAIL
 } {}
+do_test bind-2.1.1 {
+  sqlite3_bind_parameter_count $VM
+} 3
+do_test bind-2.1.2 {
+  sqlite3_bind_parameter_name $VM 1
+} {$one}
+do_test bind-2.1.3 {
+  sqlite3_bind_parameter_name $VM 2
+} {$::two}
+do_test bind-2.1.4 {
+  sqlite3_bind_parameter_name $VM 3
+} {${x}}
 
 # 32 bit Integers
 do_test bind-2.2 {
diff --git a/test/tclsqlite.test b/test/tclsqlite.test
index 4e55db55fc..7a8f73a9b1 100644
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@ -15,7 +15,7 @@
 # interface is pretty well tested.  This file contains some addition
 # tests for fringe issues that the main test suite does not cover.
 #
-# $Id: tclsqlite.test,v 1.28 2004/07/26 12:24:24 drh Exp $
+# $Id: tclsqlite.test,v 1.29 2004/08/20 16:02:39 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -103,7 +103,7 @@ do_test tcl-1.13 {
 do_test tcl-1.14 {
   set v [catch {db eval} msg]
   lappend v $msg
-} {1 {wrong # args: should be "db eval SQL ?ARRAY-NAME CODE?"}}
+} {1 {wrong # args: should be "db eval SQL ?ARRAY-NAME? ?SCRIPT?"}}
 do_test tcl-1.15 {
   set v [catch {db function} msg]
   lappend v $msg
diff --git a/www/capi3ref.tcl b/www/capi3ref.tcl
index 78b83a40f3..22d00045fe 100644
--- a/www/capi3ref.tcl
+++ b/www/capi3ref.tcl
@@ -1,4 +1,4 @@
-set rcsid {$Id: capi3ref.tcl,v 1.7 2004/07/22 15:45:16 drh Exp $}
+set rcsid {$Id: capi3ref.tcl,v 1.8 2004/08/20 16:02:40 drh Exp $}
 source common.tcl
 header {C/C++ Interface For SQLite Version 3}
 puts {
@@ -103,6 +103,25 @@ api {} {
  Unbound wildcards are interpreted as NULL.
 }
 
+api {} {
+  int sqlite3_bind_parameter_count(sqlite3_stmt*);
+} {
+  Return the number of wildcards in the precompiled statement given as
+  the argument.
+}
+
+api {} {
+  const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int n);
+} {
+  Return the name of the n-th wildcard in the precompiled statement.
+  Wildcards of the form ":N:" have a name which is the string ":N:".
+  Wildcards of the form "?" have no name.
+
+  If the value n is out of range or if the n-th wildcard is nameless,
+  then NULL is returned.  The returned string is always in the
+  UTF-8 encoding.
+}
+
 api {} {
   int sqlite3_busy_handler(sqlite3*, int(*)(void*,int), void*);
 } {