# 
# patch "ChangeLog"
#  from [1ca0c140585eb24f3192496cb9194d1cde27c84b]
#    to [e8b5d768f81b7412555dc8366e6e1669962aae5c]
# 
# patch "sqlite/alter.c"
#  from [6dab3d91aa4bf5c24e874145a2a547070c8c1883]
#    to [9570af388bc99471ea6e1258817fbf06e3120030]
# 
# patch "sqlite/btree.c"
#  from [1d9b2179ccac13970c883da6ae3758cc72978bb0]
#    to [25770f8cf1fe778757b69cbe0b84c02615c6e1f5]
# 
# patch "sqlite/btree.h"
#  from [2e2cc923224649337d7217df0dd32b06673ca180]
#    to [41a71ce027db9ddee72cb43df2316bbe3a1d92af]
# 
# patch "sqlite/build.c"
#  from [66bf13d2d478d43b9b490bebf07ea62524d80993]
#    to [8afb06c791adcde7787f157bbc55aeef27fb27c1]
# 
# patch "sqlite/date.c"
#  from [f3d1f5cd1503dabf426a198f3ebef5afbc122a7f]
#    to [2134ef4388256e8247405178df8a61bd60dc180a]
# 
# patch "sqlite/expr.c"
#  from [53f854495411eed41e42ec7f174aef64b7918119]
#    to [bf7253cd2d828ec8bf321321c2598e4b8918d79b]
# 
# patch "sqlite/insert.c"
#  from [7e6b123bdb3fd45a907361b1bcc2e56e66fdd0ed]
#    to [34c25c33f51a43644a42cc091ac967b070c6b6d5]
# 
# patch "sqlite/keywordhash.h"
#  from [0cd660e52de6cb47e66fdda52d630c546608ff7d]
#    to [e8949ba18076ed0333bfcec91ca2f75372a318c8]
# 
# patch "sqlite/main.c"
#  from [90cb84bbb85aa89442af41ad4323b136af6527b7]
#    to [531fab947f72d3b6e86476ed4594838a2fa277f5]
# 
# patch "sqlite/opcodes.h"
#  from [7b9ff637c7fef4df61c995f78c647ebaeab8b51e]
#    to [90bdbb426dc13fbec8ac93f59de8f23d5f271db7]
# 
# patch "sqlite/os_unix.c"
#  from [d4823c6b3dd86e8cbb6a8f9d2fd6c4b3e722f8ee]
#    to [fba0167576f09e242afd4c4978e1d2944b1da8b5]
# 
# patch "sqlite/os_win.c"
#  from [bddeae1c3299be0fbe47077dd4e98b786a067f71]
#    to [2bbbe6fbb010763c3fa79d5e951afca9b138c6b5]
# 
# patch "sqlite/pager.c"
#  from [26a642c1238615bdea53d458ab6a4df7ca070a08]
#    to [95e24c9134a00613ca87b963a84ad62d85d5b979]
# 
# patch "sqlite/pager.h"
#  from [70d496f372163abb6340f474288c4bb9ea962cf7]
#    to [9a417a1e04737c227ebbba3bdf8597d6dd51513a]
# 
# patch "sqlite/parse.c"
#  from [dce97d629708086586222771d5097739b7c55dd8]
#    to [bf752a2b845b64014c51c32f478edda7fbe0b63f]
# 
# patch "sqlite/parse.h"
#  from [0bb1681cd285c0364983df218bf0fed847d7c3c0]
#    to [c22a7a5d0ddf7da1a1a36cbc677489e69d4e5f3f]
# 
# patch "sqlite/pragma.c"
#  from [4b20dbc0f4b97f412dc511853d3d0c2e0d4adedc]
#    to [845c8ab0ab7d09ed2115d3dfc859ba2364b365a7]
# 
# patch "sqlite/select.c"
#  from [69e6093d52e871a243477e9746f820456538dd03]
#    to [a324af36afe5f050a1e070806ad3ededf1d58f50]
# 
# patch "sqlite/sqlite3.h"
#  from [dd3af5dafffc2f045cc85f56bb0d206fa6552b33]
#    to [cc5e1e2dfeb2a834e420412da25a92b742d76711]
# 
# patch "sqlite/sqliteInt.h"
#  from [b59243adc43f0326ca7d8ce0b7ebd3cc70bd670d]
#    to [474c20597ee66bb3a666bed0abd76e7be579184a]
# 
# patch "sqlite/trigger.c"
#  from [0c3ec8a6cb7176aaecc3978bfc34050ec1a852c4]
#    to [1a6d0c7c51b70bdc58d5068be72034071eff23ad]
# 
# patch "sqlite/util.c"
#  from [a53b6fc6f09093ecba1ce593ca7cb1cb77b3a20b]
#    to [02bc2750336b021b3f10e61538f665c4b0033b5d]
# 
# patch "sqlite/vdbe.c"
#  from [086e4b42d57af68fceb8c04a6e4eed901777d942]
#    to [cb701319876cb1332a7372feaaa1310cd463c9f6]
# 
# patch "sqlite/vdbe.h"
#  from [7e307333d74e134eff237bb9d45fe764e544ad6a]
#    to [7f586cb6d6b57764e5aac1f87107d6a95ddce24c]
# 
# patch "sqlite/vdbeInt.h"
#  from [e80721cd8ff611789e20743eec43363a9fb5a48e]
#    to [97b62807bd001efd82006460ad8a8d72d1c8d36d]
# 
# patch "sqlite/vdbeaux.c"
#  from [3c2f1d5df1ac21e20a9795f4a988f663b01f7b83]
#    to [f07ea8a5c3f4b2bb7505f21753ea966d2f04d4d0]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2005-04-22  Christof Petig <address@hidden>
+
+	* sqlite/*: update to sqlite 3.2.1
+
 2005-04-21  Jeremy Cowgar  <address@hidden>
 
 	* tests/t_multiple_heads_msg.at: Now checks to ensure 'multiple head'
--- sqlite/alter.c
+++ sqlite/alter.c
@@ -12,9 +12,10 @@
 ** This file contains C code routines that used to generate VDBE code
 ** that implements the ALTER TABLE command.
 **
-** $Id: alter.c,v 1.2 2005/02/15 21:36:18 drh Exp $
+** $Id: alter.c,v 1.6 2005/03/28 00:07:16 danielk1977 Exp $
 */
 #include "sqliteInt.h"
+#include <ctype.h>
 
 /*
 ** The code in this file only exists if we are not omitting the
@@ -167,6 +168,78 @@
 }
 
 /*
+** Generate the text of a WHERE expression which can be used to select all
+** temporary triggers on table pTab from the sqlite_temp_master table. If
+** table pTab has no temporary triggers, or is itself stored in the 
+** temporary database, NULL is returned.
+*/
+static char *whereTempTriggers(Parse *pParse, Table *pTab){
+  Trigger *pTrig;
+  char *zWhere = 0;
+  char *tmp = 0;
+  if( pTab->iDb!=1 ){
+    for( pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext ){
+      if( pTrig->iDb==1 ){
+        if( !zWhere ){
+          zWhere = sqlite3MPrintf("name=%Q", pTrig->name);
+        }else{
+          tmp = zWhere;
+          zWhere = sqlite3MPrintf("%s OR name=%Q", zWhere, pTrig->name);
+          sqliteFree(tmp);
+        }
+      }
+    }
+  }
+  return zWhere;
+}
+
+/*
+** Generate code to drop and reload the internal representation of table
+** pTab from the database, including triggers and temporary triggers.
+** Argument zName is the name of the table in the database schema at
+** the time the generated code is executed. This can be different from
+** pTab->zName if this function is being called to code part of an 
+** "ALTER TABLE RENAME TO" statement.
+*/
+static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){
+  Vdbe *v;
+  char *zWhere;
+  int iDb;
+#ifndef SQLITE_OMIT_TRIGGER
+  Trigger *pTrig;
+#endif
+
+  v = sqlite3GetVdbe(pParse);
+  if( !v ) return;
+  iDb = pTab->iDb;
+
+#ifndef SQLITE_OMIT_TRIGGER
+  /* Drop any table triggers from the internal schema. */
+  for(pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext){
+    assert( pTrig->iDb==iDb || pTrig->iDb==1 );
+    sqlite3VdbeOp3(v, OP_DropTrigger, pTrig->iDb, 0, pTrig->name, 0);
+  }
+#endif
+
+  /* Drop the table and index from the internal schema */
+  sqlite3VdbeOp3(v, OP_DropTable, iDb, 0, pTab->zName, 0);
+
+  /* Reload the table, index and permanent trigger schemas. */
+  zWhere = sqlite3MPrintf("tbl_name=%Q", zName);
+  if( !zWhere ) return;
+  sqlite3VdbeOp3(v, OP_ParseSchema, iDb, 0, zWhere, P3_DYNAMIC);
+
+#ifndef SQLITE_OMIT_TRIGGER
+  /* Now, if the table is not stored in the temp database, reload any temp 
+  ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBQUERY is defined. 
+  */
+  if( (zWhere=whereTempTriggers(pParse, pTab)) ){
+    sqlite3VdbeOp3(v, OP_ParseSchema, 1, 0, zWhere, P3_DYNAMIC);
+  }
+#endif
+}
+
+/*
 ** Generate code to implement the "ALTER TABLE xxx RENAME TO yyy" 
 ** command. 
 */
@@ -179,11 +252,10 @@
   char *zDb;                /* Name of database iDb */
   Table *pTab;              /* Table being renamed */
   char *zName = 0;          /* NULL-terminated version of pName */ 
-  char *zWhere = 0;         /* Where clause of schema elements to reparse */
   sqlite3 *db = pParse->db; /* Database connection */
   Vdbe *v;
 #ifndef SQLITE_OMIT_TRIGGER
-  char *zTempTrig = 0;      /* Where clause to locate temp triggers */
+  char *zWhere = 0;         /* Where clause to locate temp triggers */
 #endif
   
   assert( pSrc->nSrc==1 );
@@ -255,7 +327,7 @@
           "(type='table' OR type='index' OR type='trigger');", 
       zDb, SCHEMA_TABLE(iDb), zName, zName, zName, 
 #ifndef SQLITE_OMIT_TRIGGER
-zName,
+      zName,
 #endif
       zName, strlen(pTab->zName), pTab->zName
   );
@@ -276,59 +348,205 @@
   ** table. Don't do this if the table being ALTERed is itself located in
   ** the temp database.
   */
-  if( iDb!=1 ){
-    Trigger *pTrig;
-    char *tmp = 0;
-    for( pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext ){
-      if( pTrig->iDb==1 ){
-        if( !zTempTrig ){
-          zTempTrig = 
-              sqlite3MPrintf("type = 'trigger' AND (name=%Q", pTrig->name);
-        }else{
-          tmp = zTempTrig;
-          zTempTrig = sqlite3MPrintf("%s OR name=%Q", zTempTrig, pTrig->name);
-          sqliteFree(tmp);
-        }
-      }
-    }
-    if( zTempTrig ){
-      tmp = zTempTrig;
-      zTempTrig = sqlite3MPrintf("%s)", zTempTrig);
-      sqliteFree(tmp);
-      sqlite3NestedParse(pParse, 
-          "UPDATE sqlite_temp_master SET "
-              "sql = sqlite_rename_trigger(sql, %Q), "
-              "tbl_name = %Q "
-              "WHERE %s;", zName, zName, zTempTrig);
-    }
+  if( (zWhere=whereTempTriggers(pParse, pTab)) ){
+    sqlite3NestedParse(pParse, 
+        "UPDATE sqlite_temp_master SET "
+            "sql = sqlite_rename_trigger(sql, %Q), "
+            "tbl_name = %Q "
+            "WHERE %s;", zName, zName, zWhere);
+    sqliteFree(zWhere);
   }
 #endif
 
-  /* Drop the elements of the in-memory schema that refered to the table
-  ** renamed and load the new versions from the database.
+  /* Drop and reload the internal table schema. */
+  reloadTableSchema(pParse, pTab, zName);
+
+exit_rename_table:
+  sqlite3SrcListDelete(pSrc);
+  sqliteFree(zName);
+}
+
+
+/*
+** This function is called after an "ALTER TABLE ... ADD" statement
+** has been parsed. Argument pColDef contains the text of the new
+** column definition.
+**
+** The Table structure pParse->pNewTable was extended to include
+** the new column during parsing.
+*/
+void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
+  Table *pNew;              /* Copy of pParse->pNewTable */
+  Table *pTab;              /* Table being altered */
+  int iDb;                  /* Database number */
+  const char *zDb;          /* Database name */
+  const char *zTab;         /* Table name */
+  char *zCol;               /* Null-terminated column definition */
+  Column *pCol;             /* The new column */
+  Expr *pDflt;              /* Default value for the new column */
+  Vdbe *v;
+
+  if( pParse->nErr ) return;
+  pNew = pParse->pNewTable;
+  assert( pNew );
+
+  iDb = pNew->iDb;
+  zDb = pParse->db->aDb[iDb].zName;
+  zTab = pNew->zName;
+  pCol = &pNew->aCol[pNew->nCol-1];
+  pDflt = pCol->pDflt;
+  pTab = sqlite3FindTable(pParse->db, zTab, zDb);
+  assert( pTab );
+
+  /* If the default value for the new column was specified with a 
+  ** literal NULL, then set pDflt to 0. This simplifies checking
+  ** for an SQL NULL default below.
   */
-  if( pParse->nErr==0 ){
-#ifndef SQLITE_OMIT_TRIGGER
-    Trigger *pTrig;
-    for( pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext ){
-      assert( pTrig->iDb==iDb || pTrig->iDb==1 );
-      sqlite3VdbeOp3(v, OP_DropTrigger, pTrig->iDb, 0, pTrig->name, 0);
+  if( pDflt && pDflt->op==TK_NULL ){
+    pDflt = 0;
+  }
+
+  /* Check that the new column is not specified as PRIMARY KEY or UNIQUE.
+  ** If there is a NOT NULL constraint, then the default value for the
+  ** column must not be NULL.
+  */
+  if( pCol->isPrimKey ){
+    sqlite3ErrorMsg(pParse, "Cannot add a PRIMARY KEY column");
+    return;
+  }
+  if( pNew->pIndex ){
+    sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column");
+    return;
+  }
+  if( pCol->notNull && !pDflt ){
+    sqlite3ErrorMsg(pParse, 
+        "Cannot add a NOT NULL column with default value NULL");
+    return;
+  }
+
+  /* Ensure the default expression is something that sqlite3ValueFromExpr()
+  ** can handle (i.e. not CURRENT_TIME etc.)
+  */
+  if( pDflt ){
+    sqlite3_value *pVal;
+    if( sqlite3ValueFromExpr(pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){
+      /* malloc() has failed */
+      return;
     }
-#endif
-    sqlite3VdbeOp3(v, OP_DropTable, iDb, 0, pTab->zName, 0);
-    zWhere = sqlite3MPrintf("tbl_name=%Q", zName);
-    sqlite3VdbeOp3(v, OP_ParseSchema, iDb, 0, zWhere, P3_DYNAMIC);
-#ifndef SQLITE_OMIT_TRIGGER
-    if( zTempTrig ){
-      sqlite3VdbeOp3(v, OP_ParseSchema, 1, 0, zTempTrig, P3_DYNAMIC);
+    if( !pVal ){
+      sqlite3ErrorMsg(pParse, "Cannot add a column with non-constant default");
+      return;
     }
-  }else{
-    sqliteFree(zTempTrig);
-#endif
+    sqlite3ValueFree(pVal);
   }
 
-exit_rename_table:
+  /* Modify the CREATE TABLE statement. */
+  zCol = sqliteStrNDup(pColDef->z, pColDef->n);
+  if( zCol ){
+    char *zEnd = &zCol[pColDef->n-1];
+    while( (zEnd>zCol && *zEnd==';') || isspace(*(unsigned char *)zEnd) ){
+      *zEnd-- = '\0';
+    }
+    sqlite3NestedParse(pParse, 
+        "UPDATE %Q.%s SET "
+          "sql = substr(sql,1,%d) || ', ' || %Q || substr(sql,%d,length(sql)) "
+        "WHERE type = 'table' AND name = %Q", 
+      zDb, SCHEMA_TABLE(iDb), pNew->addColOffset, zCol, pNew->addColOffset+1,
+      zTab
+    );
+    sqliteFree(zCol);
+  }
+
+  /* If the default value of the new column is NULL, then set the file
+  ** format to 2. If the default value of the new column is not NULL,
+  ** the file format becomes 3.
+  */
+  if( (v=sqlite3GetVdbe(pParse)) ){
+    int f = (pDflt?3:2);
+
+    /* Only set the file format to $f if it is currently less than $f. */
+    sqlite3VdbeAddOp(v, OP_ReadCookie, iDb, 1);
+    sqlite3VdbeAddOp(v, OP_Integer, f, 0);
+    sqlite3VdbeAddOp(v, OP_Ge, 0, sqlite3VdbeCurrentAddr(v)+3);
+    sqlite3VdbeAddOp(v, OP_Integer, f, 0);
+    sqlite3VdbeAddOp(v, OP_SetCookie, iDb, 1);
+  }
+
+  /* Reload the schema of the modified table. */
+  reloadTableSchema(pParse, pTab, pTab->zName);
+}
+
+
+/*
+** This function is called by the parser after the table-name in
+** an "ALTER TABLE <table-name> ADD" statement is parsed. Argument 
+** pSrc is the full-name of the table being altered.
+**
+** This routine makes a (partial) copy of the Table structure
+** for the table being altered and sets Parse.pNewTable to point
+** to it. Routines called by the parser as the column definition
+** is parsed (i.e. sqlite3AddColumn()) add the new Column data to 
+** the copy. The copy of the Table structure is deleted by tokenize.c 
+** after parsing is finished.
+**
+** Routine sqlite3AlterFinishAddColumn() will be called to complete
+** coding the "ALTER TABLE ... ADD" statement.
+*/
+void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
+  Table *pNew;
+  Table *pTab;
+  Vdbe *v;
+  int iDb;
+  int i;
+  int nAlloc;
+
+  /* Look up the table being altered. */
+  assert( !pParse->pNewTable );
+  pTab = sqlite3LocateTable(pParse, pSrc->a[0].zName, pSrc->a[0].zDatabase);
+  if( !pTab ) goto exit_begin_add_column;
+
+  /* Make sure this is not an attempt to ALTER a view. */
+  if( pTab->pSelect ){
+    sqlite3ErrorMsg(pParse, "Cannot add a column to a view");
+    goto exit_begin_add_column;
+  }
+
+  assert( pTab->addColOffset>0 );
+  iDb = pTab->iDb;
+
+  /* Put a copy of the Table struct in Parse.pNewTable for the
+  ** sqlite3AddColumn() function and friends to modify.
+  */
+  pNew = (Table *)sqliteMalloc(sizeof(Table));
+  if( !pNew ) goto exit_begin_add_column;
+  pParse->pNewTable = pNew;
+  pNew->nCol = pTab->nCol;
+  assert( pNew->nCol>0 );
+  nAlloc = (((pNew->nCol-1)/8)*8)+8;
+  assert( nAlloc>=pNew->nCol && nAlloc%8==0 && nAlloc-pNew->nCol<8 );
+  pNew->aCol = (Column *)sqliteMalloc(sizeof(Column)*nAlloc);
+  pNew->zName = sqliteStrDup(pTab->zName);
+  if( !pNew->aCol || !pNew->zName ){
+    goto exit_begin_add_column;
+  }
+  memcpy(pNew->aCol, pTab->aCol, sizeof(Column)*pNew->nCol);
+  for(i=0; i<pNew->nCol; i++){
+    Column *pCol = &pNew->aCol[i];
+    pCol->zName = sqliteStrDup(pCol->zName);
+    pCol->zType = 0;
+    pCol->pDflt = 0;
+  }
+  pNew->iDb = iDb;
+  pNew->addColOffset = pTab->addColOffset;
+
+  /* Begin a transaction and increment the schema cookie.  */
+  sqlite3BeginWriteOperation(pParse, 0, iDb);
+  v = sqlite3GetVdbe(pParse);
+  if( !v ) goto exit_begin_add_column;
+  sqlite3ChangeCookie(pParse->db, v, iDb);
+
+exit_begin_add_column:
   sqlite3SrcListDelete(pSrc);
-  sqliteFree(zName);
+  return;
 }
 #endif  /* SQLITE_ALTER_TABLE */
--- sqlite/btree.c
+++ sqlite/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.252 2005/03/14 02:01:50 drh Exp $
+** $Id: btree.c,v 1.256 2005/03/29 13:17:46 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -2160,12 +2160,11 @@
     goto create_cursor_exception;
   }
   pCur->pgnoRoot = (Pgno)iTable;
+  pCur->pPage = 0;  /* For exit-handler, in case getAndInitPage() fails. */
   if( iTable==1 && sqlite3pager_pagecount(pBt->pPager)==0 ){
     rc = SQLITE_EMPTY;
-    pCur->pPage = 0;
     goto create_cursor_exception;
   }
-  pCur->pPage = 0;  /* For exit-handler, in case getAndInitPage() fails. */
   rc = getAndInitPage(pBt, pCur->pgnoRoot, &pCur->pPage, 0);
   if( rc!=SQLITE_OK ){
     goto create_cursor_exception;
@@ -3252,8 +3251,8 @@
     if( rc ) return rc;
     ovflPgno = get4byte(pOvfl->aData);
     rc = freePage(pOvfl);
+    sqlite3pager_unref(pOvfl->aData);
     if( rc ) return rc;
-    sqlite3pager_unref(pOvfl->aData);
   }
   return SQLITE_OK;
 }
@@ -3525,7 +3524,8 @@
     end = cellOffset + 2*pPage->nCell + 2;
     ins = cellOffset + 2*i;
     if( end > top - sz ){
-      defragmentPage(pPage);
+      int rc = defragmentPage(pPage);
+      if( rc!=SQLITE_OK ) return rc;
       top = get2byte(&data[hdr+5]);
       assert( end + sz <= top );
     }
@@ -3757,7 +3757,8 @@
 static int balance_nonroot(MemPage *pPage){
   MemPage *pParent;            /* The parent of pPage */
   Btree *pBt;                  /* The whole database */
-  int nCell = 0;               /* Number of cells in aCell[] */
+  int nCell = 0;               /* Number of cells in apCell[] */
+  int nMaxCells = 0;           /* Allocated size of apCell, szCell, aFrom. */
   int nOld;                    /* Number of pages in apOld[] */
   int nNew;                    /* Number of pages in apNew[] */
   int nDiv;                    /* Number of cells in apDiv[] */
@@ -3771,7 +3772,6 @@
   int pageFlags;               /* Value of pPage->aData[0] */
   int subtotal;                /* Subtotal of bytes in cells on one page */
   int iSpace = 0;              /* First unused byte of aSpace[] */
-  int mxCellPerPage;           /* Maximum number of cells in one page */
   MemPage *apOld[NB];          /* pPage and up to two siblings */
   Pgno pgnoOld[NB];            /* Page numbers for each page in apOld[] */
   MemPage *apCopy[NB];         /* Private copies of apOld[] pages */
@@ -3781,7 +3781,7 @@
   u8 *apDiv[NB];               /* Divider cells in pParent */
   int cntNew[NB+2];            /* Index in aCell[] of cell after i-th page */
   int szNew[NB+2];             /* Combined size of cells place on i-th page */
-  u8 **apCell;                 /* All cells begin balanced */
+  u8 **apCell = 0;             /* All cells begin balanced */
   int *szCell;                 /* Local size of all cells in apCell[] */
   u8 *aCopy[NB];               /* Space for holding data of apCopy[] */
   u8 *aSpace;                  /* Space to hold copies of dividers cells */
@@ -3826,31 +3826,6 @@
 #endif
 
   /*
-  ** Allocate space for memory structures
-  */
-  mxCellPerPage = MX_CELL(pBt);
-  apCell = sqliteMallocRaw( 
-       (mxCellPerPage+2)*NB*(sizeof(u8*)+sizeof(int))
-     + sizeof(MemPage)*NB
-     + pBt->psAligned*(5+NB)
-     + (ISAUTOVACUUM ? (mxCellPerPage+2)*NN*2 : 0)
-  );
-  if( apCell==0 ){
-    return SQLITE_NOMEM;
-  }
-  szCell = (int*)&apCell[(mxCellPerPage+2)*NB];
-  aCopy[0] = (u8*)&szCell[(mxCellPerPage+2)*NB];
-  for(i=1; i<NB; i++){
-    aCopy[i] = &aCopy[i-1][pBt->psAligned+sizeof(MemPage)];
-  }
-  aSpace = &aCopy[NB-1][pBt->psAligned+sizeof(MemPage)];
-#ifndef SQLITE_OMIT_AUTOVACUUM
-  if( pBt->autoVacuum ){
-    aFrom = &aSpace[5*pBt->psAligned];
-  }
-#endif
-  
-  /*
   ** Find the cell in the parent page whose left child points back
   ** to pPage.  The "idx" variable is the index of that cell.  If pPage
   ** is the rightmost child of pParent then set idx to pParent->nCell 
@@ -3910,9 +3885,36 @@
     apCopy[i] = 0;
     assert( i==nOld );
     nOld++;
+    nMaxCells += 1+apOld[i]->nCell+apOld[i]->nOverflow;
   }
 
   /*
+  ** Allocate space for memory structures
+  */
+  apCell = sqliteMallocRaw( 
+       nMaxCells*sizeof(u8*)                           /* apCell */
+     + nMaxCells*sizeof(int)                           /* szCell */
+     + sizeof(MemPage)*NB                              /* aCopy */
+     + pBt->psAligned*(5+NB)                           /* aSpace */
+     + (ISAUTOVACUUM ? nMaxCells : 0)     /* aFrom */
+  );
+  if( apCell==0 ){
+    rc = SQLITE_NOMEM;
+    goto balance_cleanup;
+  }
+  szCell = (int*)&apCell[nMaxCells];
+  aCopy[0] = (u8*)&szCell[nMaxCells];
+  for(i=1; i<NB; i++){
+    aCopy[i] = &aCopy[i-1][pBt->psAligned+sizeof(MemPage)];
+  }
+  aSpace = &aCopy[NB-1][pBt->psAligned+sizeof(MemPage)];
+#ifndef SQLITE_OMIT_AUTOVACUUM
+  if( pBt->autoVacuum ){
+    aFrom = &aSpace[5*pBt->psAligned];
+  }
+#endif
+  
+  /*
   ** Make copies of the content of pPage and its siblings into aOld[].
   ** The rest of this function will use data from the copies rather
   ** that the original pages since the original pages will be in the
@@ -3948,6 +3950,7 @@
     MemPage *pOld = apCopy[i];
     int limit = pOld->nCell+pOld->nOverflow;
     for(j=0; j<limit; j++){
+      assert( nCell<nMaxCells );
       apCell[nCell] = findOverflowCell(pOld, j);
       szCell[nCell] = cellSizePtr(pOld, apCell[nCell]);
 #ifndef SQLITE_OMIT_AUTOVACUUM
@@ -3975,6 +3978,7 @@
         dropCell(pParent, nxDiv, sz);
       }else{
         u8 *pTemp;
+        assert( nCell<nMaxCells );
         szCell[nCell] = sz;
         pTemp = &aSpace[iSpace];
         iSpace += sz;
@@ -4020,6 +4024,7 @@
   */
   usableSpace = pBt->usableSize - 12 + leafCorrection;
   for(subtotal=k=i=0; i<nCell; i++){
+    assert( i<nMaxCells );
     subtotal += szCell[i] + 2;
     if( subtotal > usableSpace ){
       szNew[k] = subtotal - szCell[i];
@@ -4051,6 +4056,8 @@
 
     r = cntNew[i-1] - 1;
     d = r + 1 - leafData;
+    assert( d<nMaxCells );
+    assert( r<nMaxCells );
     while( szRight==0 || szRight+szCell[d]+2<=szLeft-(szCell[r]+2) ){
       szRight += szCell[d] + 2;
       szLeft -= szCell[r] + 2;
@@ -4147,6 +4154,7 @@
   for(i=0; i<nNew; i++){
     /* Assemble the new sibling page. */
     MemPage *pNew = apNew[i];
+    assert( j<nMaxCells );
     assert( pNew->pgno==pgnoNew[i] );
     assemblePage(pNew, cntNew[i]-j, &apCell[j], &szCell[j]);
     assert( pNew->nCell>0 );
@@ -4160,6 +4168,7 @@
     */
     if( pBt->autoVacuum ){
       for(k=j; k<cntNew[i]; k++){
+        assert( k<nMaxCells );
         if( aFrom[k]==0xFF || apCopy[aFrom[k]]->pgno!=pNew->pgno ){
           rc = ptrmapPutOvfl(pNew, k-j);
           if( rc!=SQLITE_OK ){
@@ -4179,6 +4188,8 @@
       u8 *pCell;
       u8 *pTemp;
       int sz;
+
+      assert( j<nMaxCells );
       pCell = apCell[j];
       sz = szCell[j] + leafCorrection;
       if( !pNew->leaf ){
@@ -4406,7 +4417,7 @@
   memcpy(&cdata[brk], &data[brk], usableSize-brk);
   assert( pChild->isInit==0 );
   rc = initPage(pChild, pPage);
-  if( rc ) return rc;
+  if( rc ) goto balancedeeper_out;
   memcpy(pChild->aOvfl, pPage->aOvfl, pPage->nOverflow*sizeof(pPage->aOvfl[0]));
   pChild->nOverflow = pPage->nOverflow;
   if( pChild->nOverflow ){
@@ -4420,7 +4431,7 @@
   if( pBt->autoVacuum ){
     int i;
     rc = ptrmapPut(pBt, pChild->pgno, PTRMAP_BTREE, pPage->pgno);
-    if( rc ) return rc;
+    if( rc ) goto balancedeeper_out;
     for(i=0; i<pChild->nCell; i++){
       rc = ptrmapPutOvfl(pChild, i);
       if( rc!=SQLITE_OK ){
@@ -4430,6 +4441,8 @@
   }
 #endif
   rc = balance_nonroot(pChild);
+
+balancedeeper_out:
   releasePage(pChild);
   return rc;
 }
@@ -4616,7 +4629,7 @@
     unsigned char *pNext;
     int szNext;
     int notUsed;
-    unsigned char *tempCell;
+    unsigned char *tempCell = 0;
     assert( !pPage->leafData );
     getTempCursor(pCur, &leafCur);
     rc = sqlite3BtreeNext(&leafCur, &notUsed);
@@ -4624,26 +4637,34 @@
       if( rc!=SQLITE_NOMEM ){
         rc = SQLITE_CORRUPT;  /* bkpt-CORRUPT */
       }
-      return rc;
     }
-    rc = sqlite3pager_write(leafCur.pPage->aData);
-    if( rc ) return rc;
-    TRACE(("DELETE: table=%d delete internal from %d replace from leaf %d\n",
-       pCur->pgnoRoot, pPage->pgno, leafCur.pPage->pgno));
-    dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell));
-    pNext = findCell(leafCur.pPage, leafCur.idx);
-    szNext = cellSizePtr(leafCur.pPage, pNext);
-    assert( MX_CELL_SIZE(pBt)>=szNext+4 );
-    tempCell = sqliteMallocRaw( MX_CELL_SIZE(pBt) );
-    if( tempCell==0 ) return SQLITE_NOMEM;
-    rc = insertCell(pPage, pCur->idx, pNext-4, szNext+4, tempCell, 0);
-    if( rc!=SQLITE_OK ) return rc;
-    put4byte(findOverflowCell(pPage, pCur->idx), pgnoChild);
-    rc = balance(pPage, 0);
+    if( rc==SQLITE_OK ){
+      rc = sqlite3pager_write(leafCur.pPage->aData);
+    }
+    if( rc==SQLITE_OK ){
+      TRACE(("DELETE: table=%d delete internal from %d replace from leaf %d\n",
+         pCur->pgnoRoot, pPage->pgno, leafCur.pPage->pgno));
+      dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell));
+      pNext = findCell(leafCur.pPage, leafCur.idx);
+      szNext = cellSizePtr(leafCur.pPage, pNext);
+      assert( MX_CELL_SIZE(pBt)>=szNext+4 );
+      tempCell = sqliteMallocRaw( MX_CELL_SIZE(pBt) );
+      if( tempCell==0 ){
+        rc = SQLITE_NOMEM;
+      }
+    }
+    if( rc==SQLITE_OK ){
+      rc = insertCell(pPage, pCur->idx, pNext-4, szNext+4, tempCell, 0);
+    }
+    if( rc==SQLITE_OK ){
+      put4byte(findOverflowCell(pPage, pCur->idx), pgnoChild);
+      rc = balance(pPage, 0);
+    }
+    if( rc==SQLITE_OK ){
+      dropCell(leafCur.pPage, leafCur.idx, szNext);
+      rc = balance(leafCur.pPage, 0);
+    }
     sqliteFree(tempCell);
-    if( rc ) return rc;
-    dropCell(leafCur.pPage, leafCur.idx, szNext);
-    rc = balance(leafCur.pPage, 0);
     releaseTempCursor(&leafCur);
   }else{
     TRACE(("DELETE: table=%d delete from leaf %d\n",
@@ -4651,7 +4672,9 @@
     dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell));
     rc = balance(pPage, 0);
   }
-  moveToRoot(pCur);
+  if( rc==SQLITE_OK ){
+    moveToRoot(pCur);
+  }
   return rc;
 }
 
@@ -4792,7 +4815,7 @@
   MemPage *pParent,     /* Parent page.  NULL for the root */
   int freePageFlag      /* Deallocate page if true */
 ){
-  MemPage *pPage;
+  MemPage *pPage = 0;
   int rc;
   unsigned char *pCell;
   int i;
@@ -4802,27 +4825,29 @@
   }
 
   rc = getAndInitPage(pBt, pgno, &pPage, pParent);
-  if( rc ) return rc;
+  if( rc ) goto cleardatabasepage_out;
   rc = sqlite3pager_write(pPage->aData);
-  if( rc ) return rc;
+  if( rc ) goto cleardatabasepage_out;
   for(i=0; i<pPage->nCell; i++){
     pCell = findCell(pPage, i);
     if( !pPage->leaf ){
       rc = clearDatabasePage(pBt, get4byte(pCell), pPage->pParent, 1);
-      if( rc ) return rc;
+      if( rc ) goto cleardatabasepage_out;
     }
     rc = clearCell(pPage, pCell);
-    if( rc ) return rc;
+    if( rc ) goto cleardatabasepage_out;
   }
   if( !pPage->leaf ){
     rc = clearDatabasePage(pBt, get4byte(&pPage->aData[8]), pPage->pParent, 1);
-    if( rc ) return rc;
+    if( rc ) goto cleardatabasepage_out;
   }
   if( freePageFlag ){
     rc = freePage(pPage);
   }else{
     zeroPage(pPage, pPage->aData[0] | PTF_LEAF);
   }
+
+cleardatabasepage_out:
   releasePage(pPage);
   return rc;
 }
@@ -4896,7 +4921,10 @@
   rc = getPage(pBt, (Pgno)iTable, &pPage);
   if( rc ) return rc;
   rc = sqlite3BtreeClearTable(pBt, iTable);
-  if( rc ) return rc;
+  if( rc ){
+    releasePage(pPage);
+    return rc;
+  }
 
   *piMoved = 0;
 
@@ -5755,3 +5783,16 @@
   }
   return SQLITE_OK;
 }
+
+#ifndef SQLITE_OMIT_GLOBALRECOVER
+/*
+** Reset the btree and underlying pager after a malloc() failure. Any
+** transaction that was active when malloc() failed is rolled back.
+*/
+int sqlite3BtreeReset(Btree *pBt){
+  if( pBt->pCursor ) return SQLITE_BUSY;
+  pBt->inTrans = TRANS_NONE;
+  unlockBtreeIfUnused(pBt);
+  return sqlite3pager_reset(pBt->pPager);
+}
+#endif
--- sqlite/btree.h
+++ sqlite/btree.h
@@ -13,7 +13,7 @@
 ** subsystem.  See comments in the source code for a detailed description
 ** of what each interface routine does.
 **
-** @(#) $Id: btree.h,v 1.62 2005/02/06 02:45:42 drh Exp $
+** @(#) $Id: btree.h,v 1.63 2005/03/21 04:04:03 danielk1977 Exp $
 */
 #ifndef _BTREE_H_
 #define _BTREE_H_
@@ -73,6 +73,7 @@
 int sqlite3BtreeIsInTrans(Btree*);
 int sqlite3BtreeIsInStmt(Btree*);
 int sqlite3BtreeSync(Btree*, const char *zMaster);
+int sqlite3BtreeReset(Btree *);
 
 const char *sqlite3BtreeGetFilename(Btree *);
 const char *sqlite3BtreeGetDirname(Btree *);
--- sqlite/build.c
+++ sqlite/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.313 2005/03/16 12:15:21 danielk1977 Exp $
+** $Id: build.c,v 1.318 2005/03/29 03:10:59 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -168,7 +168,7 @@
   int i;
   assert( zName!=0 );
   assert( (db->flags & SQLITE_Initialized) || db->init.busy );
-  for(i=0; i<db->nDb; i++){
+  for(i=OMIT_TEMPDB; i<db->nDb; i++){
     int j = (i<2) ? i^1 : i;   /* Search TEMP before MAIN */
     if( zDatabase!=0 && sqlite3StrICmp(zDatabase, db->aDb[j].zName) ) continue;
     p = sqlite3HashFind(&db->aDb[j].tblHash, zName, strlen(zName)+1);
@@ -227,7 +227,7 @@
   Index *p = 0;
   int i;
   assert( (db->flags & SQLITE_Initialized) || db->init.busy );
-  for(i=0; i<db->nDb; i++){
+  for(i=OMIT_TEMPDB; i<db->nDb; i++){
     int j = (i<2) ? i^1 : i;  /* Search TEMP before MAIN */
     if( zDb && sqlite3StrICmp(zDb, db->aDb[j].zName) ) continue;
     p = sqlite3HashFind(&db->aDb[j].idxHash, zName, strlen(zName)+1);
@@ -393,12 +393,14 @@
   int i;
   Column *pCol;
   assert( pTable!=0 );
-  for(i=0, pCol=pTable->aCol; i<pTable->nCol; i++, pCol++){
-    sqliteFree(pCol->zName);
-    sqlite3ExprDelete(pCol->pDflt);
-    sqliteFree(pCol->zType);
+  if( (pCol = pTable->aCol)!=0 ){
+    for(i=0; i<pTable->nCol; i++, pCol++){
+      sqliteFree(pCol->zName);
+      sqlite3ExprDelete(pCol->pDflt);
+      sqliteFree(pCol->zType);
+    }
+    sqliteFree(pTable->aCol);
   }
-  sqliteFree(pTable->aCol);
   pTable->aCol = 0;
   pTable->nCol = 0;
 }
@@ -535,7 +537,8 @@
   if( zName ){
     n = strlen(zName);
     for(i=(db->nDb-1), pDb=&db->aDb[i]; i>=0; i--, pDb--){
-      if( n==strlen(pDb->zName) && 0==sqlite3StrICmp(pDb->zName, zName) ){
+      if( (!OMIT_TEMPDB || i!=1 ) && n==strlen(pDb->zName) && 
+          0==sqlite3StrICmp(pDb->zName, zName) ){
         break;
       }
     }
@@ -654,12 +657,12 @@
   */
   iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName);
   if( iDb<0 ) return;
-  if( isTemp && iDb>1 ){
+  if( !OMIT_TEMPDB && isTemp && iDb>1 ){
     /* If creating a temp table, the name may not be qualified */
     sqlite3ErrorMsg(pParse, "temporary table name must be unqualified");
     return;
   }
-  if( isTemp ) iDb = 1;
+  if( !OMIT_TEMPDB && isTemp ) iDb = 1;
 
   pParse->sNameToken = *pName;
   zName = sqlite3NameFromToken(pName);
@@ -677,13 +680,13 @@
       goto begin_table_error;
     }
     if( isView ){
-      if( isTemp ){
+      if( !OMIT_TEMPDB && isTemp ){
         code = SQLITE_CREATE_TEMP_VIEW;
       }else{
         code = SQLITE_CREATE_VIEW;
       }
     }else{
-      if( isTemp ){
+      if( !OMIT_TEMPDB && isTemp ){
         code = SQLITE_CREATE_TEMP_TABLE;
       }else{
         code = SQLITE_CREATE_TABLE;
@@ -1374,7 +1377,7 @@
   n += 35 + 6*p->nCol;
   zStmt = sqliteMallocRaw( n );
   if( zStmt==0 ) return 0;
-  strcpy(zStmt, p->iDb==1 ? "CREATE TEMP TABLE " : "CREATE TABLE ");
+  strcpy(zStmt, !OMIT_TEMPDB&&p->iDb==1 ? "CREATE TEMP TABLE ":"CREATE TABLE ");
   k = strlen(zStmt);
   identPut(zStmt, &k, p->zName);
   zStmt[k++] = '(';
@@ -1405,7 +1408,7 @@
 ** this is a temporary table or db->init.busy==1.  When db->init.busy==1
 ** it means we are reading the sqlite_master table because we just
 ** connected to the database or because the sqlite_master table has
-** recently changes, so the entry for this table already exists in
+** recently changed, so the entry for this table already exists in
 ** the sqlite_master table.  We do not want to create it again.
 **
 ** If the pSelect argument is not NULL, it means that this routine
@@ -1413,7 +1416,12 @@
 ** "CREATE TABLE ... AS SELECT ..." statement.  The column names of
 ** the new table will match the result set of the SELECT.
 */
-void sqlite3EndTable(Parse *pParse, Token *pEnd, Select *pSelect){
+void sqlite3EndTable(
+  Parse *pParse,          /* Parse context */
+  Token *pCons,           /* The ',' token after the last column defn. */
+  Token *pEnd,            /* The final ')' token in the CREATE TABLE */
+  Select *pSelect         /* Select from a "CREATE ... AS SELECT" */
+){
   Table *p;
   sqlite3 *db = pParse->db;
 
@@ -1567,6 +1575,14 @@
     pParse->pNewTable = 0;
     db->nTable++;
     db->flags |= SQLITE_InternChanges;
+
+#ifndef SQLITE_OMIT_ALTERTABLE
+    if( !p->pSelect ){
+      assert( !pSelect && pCons && pEnd );
+      if( pCons->z==0 ) pCons = pEnd;
+      p->addColOffset = 13 + (pCons->z - pParse->sNameToken.z);
+    }
+#endif
   }
 }
 
@@ -1629,7 +1645,7 @@
   sEnd.n = 1;
 
   /* Use sqlite3EndTable() to add the view to the SQLITE_MASTER table */
-  sqlite3EndTable(pParse, &sEnd, 0);
+  sqlite3EndTable(pParse, 0, &sEnd, 0);
   return;
 }
 #endif /* SQLITE_OMIT_VIEW */
@@ -1850,13 +1866,13 @@
       goto exit_drop_table;
     }
     if( isView ){
-      if( iDb==1 ){
+      if( !OMIT_TEMPDB && iDb==1 ){
         code = SQLITE_DROP_TEMP_VIEW;
       }else{
         code = SQLITE_DROP_VIEW;
       }
     }else{
-      if( iDb==1 ){
+      if( !OMIT_TEMPDB && iDb==1 ){
         code = SQLITE_DROP_TEMP_TABLE;
       }else{
         code = SQLITE_DROP_TABLE;
@@ -2174,7 +2190,6 @@
   int i, j;
   Token nullId;    /* Fake token for an empty ID list */
   DbFixer sFix;    /* For assigning database names to pTable */
-  int isTemp;      /* True for a temporary index */
   sqlite3 *db = pParse->db;
 
   int iDb;          /* Index of the database that is being written */
@@ -2195,6 +2210,7 @@
     iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName);
     if( iDb<0 ) goto exit_create_index;
 
+#ifndef SQLITE_OMIT_TEMPDB
     /* If the index name was unqualified, check if the the table
     ** is a temp table. If so, set the database to 1.
     */
@@ -2202,6 +2218,7 @@
     if( pName2 && pName2->n==0 && pTab && pTab->iDb==1 ){
       iDb = 1;
     }
+#endif
 
     if( sqlite3FixInit(&sFix, pParse, iDb, "index", pName) &&
         sqlite3FixSrcList(&sFix, pTblName)
@@ -2229,7 +2246,6 @@
     goto exit_create_index;
   }
 #endif
-  isTemp = pTab->iDb==1;
 
   /*
   ** Find the name of the index.  Make sure there is not already another
@@ -2279,12 +2295,12 @@
   */
 #ifndef SQLITE_OMIT_AUTHORIZATION
   {
-    const char *zDb = db->aDb[pTab->iDb].zName;
-    if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){
+    const char *zDb = db->aDb[iDb].zName;
+    if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(iDb), 0, zDb) ){
       goto exit_create_index;
     }
     i = SQLITE_CREATE_INDEX;
-    if( isTemp ) i = SQLITE_CREATE_TEMP_INDEX;
+    if( !OMIT_TEMPDB && iDb==1 ) i = SQLITE_CREATE_TEMP_INDEX;
     if( sqlite3AuthCheck(pParse, i, zName, pTab->zName, zDb) ){
       goto exit_create_index;
     }
@@ -2307,7 +2323,7 @@
   */
   pIndex = sqliteMalloc( sizeof(Index) + strlen(zName) + 1 +
                         (sizeof(int) + sizeof(CollSeq*))*pList->nExpr );
-  if( pIndex==0 ) goto exit_create_index;
+  if( sqlite3_malloc_failed ) goto exit_create_index;
   pIndex->aiColumn = (int*)&pIndex->keyInfo.aColl[pList->nExpr];
   pIndex->zName = (char*)&pIndex->aiColumn[pList->nExpr];
   strcpy(pIndex->zName, zName);
@@ -2547,7 +2563,7 @@
     if( sqlite3AuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){
       goto exit_drop_index;
     }
-    if( pIndex->iDb ) code = SQLITE_DROP_TEMP_INDEX;
+    if( !OMIT_TEMPDB && pIndex->iDb ) code = SQLITE_DROP_TEMP_INDEX;
     if( sqlite3AuthCheck(pParse, code, pIndex->zName, pTab->zName, zDb) ){
       goto exit_drop_index;
     }
@@ -2855,7 +2871,7 @@
     if( (pParse->cookieMask & mask)==0 ){
       pParse->cookieMask |= mask;
       pParse->cookieValue[iDb] = db->aDb[iDb].schema_cookie;
-      if( iDb==1 ){
+      if( !OMIT_TEMPDB && iDb==1 ){
         sqlite3OpenTempDatabase(pParse);
       }
     }
@@ -2888,7 +2904,7 @@
   if( setStatement && pParse->nested==0 ){
     sqlite3VdbeAddOp(v, OP_Statement, iDb, 0);
   }
-  if( iDb!=1 && pParse->db->aDb[1].pBt!=0 ){
+  if( (OMIT_TEMPDB || iDb!=1) && pParse->db->aDb[1].pBt!=0 ){
     sqlite3BeginWriteOperation(pParse, setStatement, 1);
   }
 }
--- sqlite/date.c
+++ sqlite/date.c
@@ -16,7 +16,7 @@
 ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: date.c,v 1.43 2005/01/15 01:52:32 drh Exp $
+** $Id: date.c,v 1.44 2005/03/21 00:43:44 drh Exp $
 **
 ** NOTES:
 **
@@ -272,7 +272,7 @@
     return 1;
   }
   zDate += 10;
-  while( isspace(*(u8*)zDate) ){ zDate++; }
+  while( isspace(*(u8*)zDate) || 'T'==*(u8*)zDate ){ zDate++; }
   if( parseHhMmSs(zDate, p)==0 ){
     /* We got the time */
   }else if( *zDate==0 ){
--- sqlite/expr.c
+++ sqlite/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.196 2005/03/16 12:15:21 danielk1977 Exp $
+** $Id: expr.c,v 1.197 2005/03/21 03:53:38 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -568,8 +568,8 @@
   if( pExpr || pName ){
     struct ExprList_item *pItem = &pList->a[pList->nExpr++];
     memset(pItem, 0, sizeof(*pItem));
+    pItem->zName = sqlite3NameFromToken(pName);
     pItem->pExpr = pExpr;
-    pItem->zName = sqlite3NameFromToken(pName);
   }
   return pList;
 
--- sqlite/insert.c
+++ sqlite/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.137 2005/03/16 12:15:21 danielk1977 Exp $
+** $Id: insert.c,v 1.138 2005/03/21 01:20:58 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -108,7 +108,7 @@
   if( p->pSrc==0 ) return 0;
   for(i=0, pItem=p->pSrc->a; i<p->pSrc->nSrc; i++, pItem++){
     if( pItem->pSelect ){
-      if( selectReadsTable(p, iDb, iTab) ) return 1;
+      if( selectReadsTable(pItem->pSelect, iDb, iTab) ) return 1;
     }else{
       if( pItem->pTab->iDb==iDb && pItem->pTab->tnum==iTab ) return 1;
     }
--- sqlite/keywordhash.h
+++ sqlite/keywordhash.h
@@ -1,82 +1,83 @@
-/* Hash score: 148 */
+/* Hash score: 151 */
 static int keywordCode(const char *z, int n){
-  static const char zText[504] =
-    "ABORTABLEFTEMPORARYAFTERAISELECTHENDATABASEACHECKEYALTEREFERENCES"
-    "CAPELSEXCEPTRANSACTIONATURALIKEXCLUSIVEXISTSTATEMENTRIGGEREINDEX"
-    "PLAINITIALLYANDEFAULTATTACHAVINGLOBEFOREIGNORENAMEAUTOINCREMENT"
-    "BEGINNEREPLACEBETWEENOTNULLIMITBYCASCADEFERRABLECASECOLLATECOMMIT"
-    "CONFLICTCONSTRAINTERSECTCREATECROSSCURRENT_DATECURRENT_TIMESTAMP"
-    "RAGMATCHDEFERREDELETEDESCDETACHDISTINCTDROPRIMARYFAILFROMFULL"
-    "GROUPDATEIMMEDIATEINSERTINSTEADINTOFFSETISNULLJOINORDERESTRICT"
-    "OUTERIGHTROLLBACKROWHENUNIONUNIQUEUSINGVACUUMVALUESVIEWHERE";
+  static const char zText[510] =
+    "ABORTABLEFTEMPORARYADDATABASELECTHENDEFAULTRANSACTIONATURALTER"
+    "AISEACHECKEYAFTEREFERENCESCAPELSEXCEPTRIGGEREINDEXCLUSIVEXISTS"
+    "TATEMENTANDEFERRABLEXPLAINITIALLYATTACHAVINGLOBEFOREIGNORENAME"
+    "AUTOINCREMENTBEGINNEREPLACEBETWEENOTNULLIKEBYCASCADEFERREDELETE"
+    "CASECOLLATECOLUMNCOMMITCONFLICTCONSTRAINTERSECTCREATECROSSCURRENT_DATE"
+    "CURRENT_TIMESTAMPRAGMATCHDESCDETACHDISTINCTDROPRIMARYFAILIMIT"
+    "FROMFULLGROUPDATEIMMEDIATEINSERTINSTEADINTOFFSETISNULLJOINORDER"
+    "ESTRICTOUTERIGHTROLLBACKROWHENUNIONUNIQUEUSINGVACUUMVALUESVIEW"
+    "HERE";
   static const unsigned char aHash[127] = {
-      87,  78,  99,  86,   0,   4,   0,   0, 106,   0,  72,   0,   0,
-      90,  43,   0,  88,   0,  98, 101,  92,   0,   0,   9,   0,   0,
-     105,   0, 102,  96,   0,  10,  46,   0,  40,   0,   0,  61,  66,
-       0,  60,  14,   0,   0,  35,  80,   0, 100,  69,   0,   0,  26,
-       0,  73,  59,   0,  12,   0, 107,  37,  11,   0,  75,  39,  20,
-       0,   0,   0,  34,  79,  51,  33,  48,  15,  84,   0,  36,   0,
-      70,  21,   0,  67,   0,   0,   0,   0,  45,  62,  17,  83,  32,
-      64,  82,   0,   1,   0,  13,  50,  56,   8,   0, 104,  71,  94,
-      52,   6,  55,   0,   0,  47,  89,   0,  97,   0,  65,   0,   0,
-      23,   0, 108,  49,  54,   0,   2,  53,   0, 103,
+      89,  79, 101,  88,   0,   4,   0,   0, 108,   0,  75,   0,   0,
+      92,  44,   0,  90,   0, 100, 103,  94,   0,   0,  10,   0,   0,
+     107,   0, 104,  98,   0,  11,  47,   0,  41,   0,   0,  63,  69,
+       0,  62,  19,   0,   0,  33,  81,   0, 102,  72,   0,   0,  30,
+       0,  60,  34,   0,   8,   0, 109,  38,  12,   0,  76,  40,  25,
+      64,   0,   0,  37,  80,  52,  36,  49,  20,  86,   0,  31,   0,
+      73,  26,   0,  70,   0,   0,   0,   0,  46,  65,  22,  85,  35,
+      67,  84,   0,   1,   0,   9,  51,  57,  18,   0, 106,  74,  96,
+      53,   6,  83,   0,   0,  48,  91,   0,  99,   0,  68,   0,   0,
+      15,   0, 110,  50,  55,   0,   2,  54,   0, 105,
   };
-  static const unsigned char aNext[108] = {
+  static const unsigned char aNext[110] = {
        0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,
-       0,   0,   0,   7,   0,   0,   0,   0,   0,   0,   0,  18,   5,
-       0,   0,   0,   0,   0,   0,   0,   0,   0,  27,   0,   0,   0,
-       0,   0,   0,   0,   0,  42,   0,   0,   0,   0,   0,   0,   0,
-      24,   0,   0,  44,   0,   0,   0,  30,  57,   0,   0,   0,   0,
-       0,   0,   0,  68,  41,   0,   0,   0,   0,  19,  58,  16,   0,
-      77,   0,  63,   0,  81,  31,   0,   0,   0,   0,   0,   0,   0,
-      38,  91,  93,   0,   0,  95,  22,  29,  76,   0,  25,  85,   0,
-      28,   0,  74,   0,
+       0,   0,   0,   0,   0,   0,   0,   0,  17,   0,   0,   0,   0,
+       0,   0,   0,   5,  13,   0,   7,   0,   0,   0,   0,   0,   0,
+       0,   0,   0,   0,   0,   0,  43,   0,   0,   0,   0,   0,   0,
+       0,  16,   0,  23,  45,   0,   0,   0,   0,  28,  58,   0,   0,
+       0,   0,   0,   0,   0,   0,  71,  42,   0,   0,  24,  59,  21,
+       0,  78,   0,  66,   0,   0,  82,  29,   0,   0,   0,   0,   0,
+       0,   0,  39,  93,  95,   0,   0,  97,  14,  27,  77,   0,  56,
+      87,   0,  32,   0,  61,   0,
   };
-  static const unsigned char aLen[108] = {
-       5,   5,   4,   4,   9,   2,   5,   5,   6,   4,   3,   8,   2,
-       4,   5,   3,   5,  10,   6,   4,   6,  11,   2,   7,   4,   9,
-       6,   9,   7,   7,   5,   7,   9,   3,   3,   7,   6,   6,   4,
-       6,   3,   7,   6,   6,  13,   2,   2,   5,   5,   7,   7,   3,
-       7,   4,   5,   2,   7,   3,  10,   4,   7,   6,   8,  10,   9,
-       6,   5,  12,  12,  17,   6,   5,   8,   6,   4,   6,   8,   2,
-       4,   7,   4,   4,   4,   5,   6,   9,   6,   7,   4,   2,   6,
-       3,   6,   4,   5,   8,   5,   5,   8,   3,   4,   5,   6,   5,
-       6,   6,   4,   5,
+  static const unsigned char aLen[110] = {
+       5,   5,   4,   4,   9,   2,   3,   8,   2,   6,   4,   3,   7,
+      11,   2,   7,   5,   5,   4,   5,   3,   5,  10,   6,   4,   6,
+       7,   7,   5,   9,   6,   9,   3,  10,   7,   9,   3,   6,   6,
+       4,   6,   3,   7,   6,   6,  13,   2,   2,   5,   5,   7,   7,
+       3,   7,   4,   4,   2,   7,   3,   8,   6,   4,   7,   6,   6,
+       8,  10,   9,   6,   5,  12,  12,  17,   6,   5,   4,   6,   8,
+       2,   4,   7,   4,   5,   4,   4,   5,   6,   9,   6,   7,   4,
+       2,   6,   3,   6,   4,   5,   8,   5,   5,   8,   3,   4,   5,
+       6,   5,   6,   6,   4,   5,
   };
-  static const unsigned short int aOffset[108] = {
-       0,   4,   7,  10,  10,  14,  19,  23,  26,  31,  33,  35,  40,
-      42,  44,  48,  51,  55,  63,  68,  71,  76,  85,  86,  92,  95,
-     103, 108, 116, 122, 124, 127, 132, 137, 141, 143, 150, 155, 160,
-     163, 165, 165, 169, 173, 179, 181, 183, 192, 195, 199, 206, 212,
-     212, 215, 218, 223, 225, 226, 230, 240, 244, 251, 257, 265, 272,
-     281, 287, 292, 304, 304, 320, 324, 329, 336, 342, 346, 352, 353,
-     360, 363, 370, 374, 378, 382, 385, 391, 400, 406, 413, 416, 416,
-     419, 422, 428, 432, 436, 444, 448, 453, 461, 463, 467, 472, 478,
-     483, 489, 495, 498,
+  static const unsigned short int aOffset[110] = {
+       0,   4,   7,  10,  10,  14,  19,  21,  26,  27,  32,  34,  36,
+      42,  51,  52,  57,  61,  65,  67,  71,  74,  78,  86,  91,  94,
+      99, 105, 107, 110, 118, 123, 132, 134, 143, 148, 153, 157, 162,
+     167, 170, 172, 172, 176, 180, 186, 188, 190, 199, 202, 206, 213,
+     219, 219, 222, 225, 229, 231, 232, 236, 243, 249, 253, 260, 266,
+     272, 280, 287, 296, 302, 307, 319, 319, 335, 339, 344, 348, 354,
+     355, 362, 365, 372, 375, 380, 384, 388, 391, 397, 406, 412, 419,
+     422, 422, 425, 428, 434, 438, 442, 450, 454, 459, 467, 469, 473,
+     478, 484, 489, 495, 501, 504,
   };
-  static const unsigned char aCode[108] = {
+  static const unsigned char aCode[110] = {
     TK_ABORT,      TK_TABLE,      TK_JOIN_KW,    TK_TEMP,       TK_TEMP,       
-    TK_OR,         TK_AFTER,      TK_RAISE,      TK_SELECT,     TK_THEN,       
-    TK_END,        TK_DATABASE,   TK_AS,         TK_EACH,       TK_CHECK,      
-    TK_KEY,        TK_ALTER,      TK_REFERENCES, TK_ESCAPE,     TK_ELSE,       
-    TK_EXCEPT,     TK_TRANSACTION,TK_ON,         TK_JOIN_KW,    TK_LIKE,       
-    TK_EXCLUSIVE,  TK_EXISTS,     TK_STATEMENT,  TK_TRIGGER,    TK_REINDEX,    
-    TK_INDEX,      TK_EXPLAIN,    TK_INITIALLY,  TK_ALL,        TK_AND,        
-    TK_DEFAULT,    TK_ATTACH,     TK_HAVING,     TK_GLOB,       TK_BEFORE,     
-    TK_FOR,        TK_FOREIGN,    TK_IGNORE,     TK_RENAME,     TK_AUTOINCR,   
-    TK_TO,         TK_IN,         TK_BEGIN,      TK_JOIN_KW,    TK_REPLACE,    
-    TK_BETWEEN,    TK_NOT,        TK_NOTNULL,    TK_NULL,       TK_LIMIT,      
-    TK_BY,         TK_CASCADE,    TK_ASC,        TK_DEFERRABLE, TK_CASE,       
-    TK_COLLATE,    TK_COMMIT,     TK_CONFLICT,   TK_CONSTRAINT, TK_INTERSECT,  
-    TK_CREATE,     TK_JOIN_KW,    TK_CDATE,      TK_CTIME,      TK_CTIMESTAMP, 
-    TK_PRAGMA,     TK_MATCH,      TK_DEFERRED,   TK_DELETE,     TK_DESC,       
-    TK_DETACH,     TK_DISTINCT,   TK_IS,         TK_DROP,       TK_PRIMARY,    
-    TK_FAIL,       TK_FROM,       TK_JOIN_KW,    TK_GROUP,      TK_UPDATE,     
-    TK_IMMEDIATE,  TK_INSERT,     TK_INSTEAD,    TK_INTO,       TK_OF,         
-    TK_OFFSET,     TK_SET,        TK_ISNULL,     TK_JOIN,       TK_ORDER,      
-    TK_RESTRICT,   TK_JOIN_KW,    TK_JOIN_KW,    TK_ROLLBACK,   TK_ROW,        
-    TK_WHEN,       TK_UNION,      TK_UNIQUE,     TK_USING,      TK_VACUUM,     
-    TK_VALUES,     TK_VIEW,       TK_WHERE,      
+    TK_OR,         TK_ADD,        TK_DATABASE,   TK_AS,         TK_SELECT,     
+    TK_THEN,       TK_END,        TK_DEFAULT,    TK_TRANSACTION,TK_ON,         
+    TK_JOIN_KW,    TK_ALTER,      TK_RAISE,      TK_EACH,       TK_CHECK,      
+    TK_KEY,        TK_AFTER,      TK_REFERENCES, TK_ESCAPE,     TK_ELSE,       
+    TK_EXCEPT,     TK_TRIGGER,    TK_REINDEX,    TK_INDEX,      TK_EXCLUSIVE,  
+    TK_EXISTS,     TK_STATEMENT,  TK_AND,        TK_DEFERRABLE, TK_EXPLAIN,    
+    TK_INITIALLY,  TK_ALL,        TK_ATTACH,     TK_HAVING,     TK_GLOB,       
+    TK_BEFORE,     TK_FOR,        TK_FOREIGN,    TK_IGNORE,     TK_RENAME,     
+    TK_AUTOINCR,   TK_TO,         TK_IN,         TK_BEGIN,      TK_JOIN_KW,    
+    TK_REPLACE,    TK_BETWEEN,    TK_NOT,        TK_NOTNULL,    TK_NULL,       
+    TK_LIKE,       TK_BY,         TK_CASCADE,    TK_ASC,        TK_DEFERRED,   
+    TK_DELETE,     TK_CASE,       TK_COLLATE,    TK_COLUMNKW,   TK_COMMIT,     
+    TK_CONFLICT,   TK_CONSTRAINT, TK_INTERSECT,  TK_CREATE,     TK_JOIN_KW,    
+    TK_CDATE,      TK_CTIME,      TK_CTIMESTAMP, TK_PRAGMA,     TK_MATCH,      
+    TK_DESC,       TK_DETACH,     TK_DISTINCT,   TK_IS,         TK_DROP,       
+    TK_PRIMARY,    TK_FAIL,       TK_LIMIT,      TK_FROM,       TK_JOIN_KW,    
+    TK_GROUP,      TK_UPDATE,     TK_IMMEDIATE,  TK_INSERT,     TK_INSTEAD,    
+    TK_INTO,       TK_OF,         TK_OFFSET,     TK_SET,        TK_ISNULL,     
+    TK_JOIN,       TK_ORDER,      TK_RESTRICT,   TK_JOIN_KW,    TK_JOIN_KW,    
+    TK_ROLLBACK,   TK_ROW,        TK_WHEN,       TK_UNION,      TK_UNIQUE,     
+    TK_USING,      TK_VACUUM,     TK_VALUES,     TK_VIEW,       TK_WHERE,      
   };
   int h, i;
   if( n<2 ) return TK_ID;
--- sqlite/main.c
+++ sqlite/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.282 2005/03/09 12:26:51 danielk1977 Exp $
+** $Id: main.c,v 1.284 2005/03/29 03:10:59 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -26,7 +26,17 @@
 */
 const int sqlite3one = 1;
 
+#ifndef SQLITE_OMIT_GLOBALRECOVER
 /*
+** Linked list of all open database handles. This is used by the 
+** sqlite3_global_recover() function. Entries are added to the list
+** by openDatabase() and removed by sqlite3_close().
+*/
+static sqlite3 *pDbList = 0;
+#endif
+
+
+/*
 ** Fill the InitData structure with an error message that indicates
 ** that the database is corrupt.
 */
@@ -123,7 +133,7 @@
   int meta[10];
   InitData initData;
   char const *zMasterSchema;
-  char const *zMasterName;
+  char const *zMasterName = SCHEMA_TABLE(iDb);
 
   /*
   ** The master database table has a structure like this
@@ -137,6 +147,7 @@
      "  sql text\n"
      ")"
   ;
+#ifndef SQLITE_OMIT_TEMPDB
   static const char temp_master_schema[] = 
      "CREATE TEMP TABLE sqlite_temp_master(\n"
      "  type text,\n"
@@ -146,6 +157,9 @@
      "  sql text\n"
      ")"
   ;
+#else
+  #define temp_master_schema 0
+#endif
 
   assert( iDb>=0 && iDb<db->nDb );
 
@@ -153,13 +167,12 @@
   ** and initialisation script appropriate for the database being
   ** initialised. zMasterName is the name of the master table.
   */
-  if( iDb==1 ){
+  if( !OMIT_TEMPDB && iDb==1 ){
     zMasterSchema = temp_master_schema;
-    zMasterName = TEMP_MASTER_NAME;
   }else{
     zMasterSchema = master_schema;
-    zMasterName = MASTER_NAME;
   }
+  zMasterName = SCHEMA_TABLE(iDb);
 
   /* Construct the schema tables.  */
   sqlite3SafetyOff(db);
@@ -185,7 +198,7 @@
   /* Create a cursor to hold the database open
   */
   if( db->aDb[iDb].pBt==0 ){
-    if( iDb==1 ) DbSetProperty(db, 1, DB_SchemaLoaded);
+    if( !OMIT_TEMPDB && iDb==1 ) DbSetProperty(db, 1, DB_SchemaLoaded);
     return SQLITE_OK;
   }
   rc = sqlite3BtreeCursor(db->aDb[iDb].pBt, MASTER_ROOT, 0, 0, 0, &curMain);
@@ -341,12 +354,14 @@
   ** for the TEMP database. This is loaded last, as the TEMP database
   ** schema may contain references to objects in other databases.
   */
+#ifndef SQLITE_OMIT_TEMPDB
   if( rc==SQLITE_OK && db->nDb>1 && !DbHasProperty(db, 1, DB_SchemaLoaded) ){
     rc = sqlite3InitOne(db, 1, pzErrMsg);
     if( rc ){
       sqlite3ResetInternalSchema(db, 1);
     }
   }
+#endif
 
   db->init.busy = 0;
   if( rc==SQLITE_OK ){
@@ -514,6 +529,23 @@
     sqlite3ValueFree(db->pErr);
   }
 
+#ifndef SQLITE_OMIT_GLOBALRECOVER
+  {
+    sqlite3 *pPrev = pDbList;
+    sqlite3OsEnterMutex();
+    while( pPrev && pPrev->pNext!=db ){
+      pPrev = pPrev->pNext;
+    }
+    if( pPrev ){
+      pPrev->pNext = db->pNext;
+    }else{
+      assert( pDbList==db );
+      pDbList = db->pNext;
+    }
+    sqlite3OsLeaveMutex();
+  }
+#endif
+
   db->magic = SQLITE_MAGIC_ERROR;
   sqliteFree(db);
   return SQLITE_OK;
@@ -1178,14 +1210,18 @@
     db->magic = SQLITE_MAGIC_CLOSED;
     goto opendb_out;
   }
-  db->aDb[0].zName = "main";
-  db->aDb[1].zName = "temp";
 
-  /* The default safety_level for the main database is 'full' for the temp
-  ** database it is 'NONE'. This matches the pager layer defaults.  */
+  /* The default safety_level for the main database is 'full'; for the temp
+  ** database it is 'NONE'. This matches the pager layer defaults.  
+  */
+  db->aDb[0].zName = "main";
   db->aDb[0].safety_level = 3;
+#ifndef SQLITE_OMIT_TEMPDB
+  db->aDb[1].zName = "temp";
   db->aDb[1].safety_level = 1;
+#endif
 
+
   /* Register all built-in functions, but do not attempt to read the
   ** database schema yet. This is delayed until the first time the database
   ** is accessed.
@@ -1199,6 +1235,14 @@
     sqlite3Error(db, SQLITE_NOMEM, 0);
   }
   *ppDb = db;
+#ifndef SQLITE_OMIT_GLOBALRECOVER
+  if( db ){
+    sqlite3OsEnterMutex();
+    db->pNext = pDbList;
+    pDbList = db;
+    sqlite3OsLeaveMutex();
+  }
+#endif
   return sqlite3_errcode(db);
 }
 
@@ -1400,3 +1444,39 @@
   return SQLITE_OK;
 }
 #endif /* SQLITE_OMIT_UTF16 */
+
+#ifndef SQLITE_OMIT_GLOBALRECOVER
+/*
+** This function is called to recover from a malloc failure that occured
+** within SQLite. 
+**
+** This function is *not* threadsafe. Calling this from within a threaded
+** application when threads other than the caller have used SQLite is 
+** dangerous and will almost certainly result in malfunctions.
+*/
+int sqlite3_global_recover(){
+  int rc = SQLITE_OK;
+
+  if( sqlite3_malloc_failed ){
+    sqlite3 *db;
+    int i;
+    sqlite3_malloc_failed = 0;
+    for(db=pDbList; db; db=db->pNext ){
+      sqlite3ExpirePreparedStatements(db);
+      for(i=0; i<db->nDb; i++){
+        Btree *pBt = db->aDb[i].pBt;
+        if( pBt && (rc=sqlite3BtreeReset(pBt)) ){
+          goto recover_out;
+        }
+      } 
+      db->autoCommit = 1;
+    }
+  }
+
+recover_out:
+  if( rc!=SQLITE_OK ){
+    sqlite3_malloc_failed = 1;
+  }
+  return rc;
+}
+#endif
--- sqlite/opcodes.h
+++ sqlite/opcodes.h
@@ -133,3 +133,14 @@
 #define OP_NotUsed_127                        127
 #define OP_NotUsed_128                        128
 #define OP_NotUsed_129                        129
+
+#define NOPUSH_MASK_0 65144
+#define NOPUSH_MASK_1 59007
+#define NOPUSH_MASK_2 63483
+#define NOPUSH_MASK_3 48975
+#define NOPUSH_MASK_4 65535
+#define NOPUSH_MASK_5 52991
+#define NOPUSH_MASK_6 60410
+#define NOPUSH_MASK_7 32421
+#define NOPUSH_MASK_8 0
+#define NOPUSH_MASK_9 0
--- sqlite/os_unix.c
+++ sqlite/os_unix.c
@@ -644,7 +644,7 @@
   TIMER_START;
   got = read(id->h, pBuf, amt);
   TIMER_END;
-  TRACE4("READ    %-3d %7d %d\n", id->h, last_page, TIMER_ELAPSED);
+  TRACE5("READ    %-3d %5d %7d %d\n", id->h, got, last_page, TIMER_ELAPSED);
   SEEK(0);
   /* if( got<0 ) got = 0; */
   if( got==amt ){
@@ -670,7 +670,7 @@
     pBuf = &((char*)pBuf)[wrote];
   }
   TIMER_END;
-  TRACE4("WRITE   %-3d %7d %d\n", id->h, last_page, TIMER_ELAPSED);
+  TRACE5("WRITE   %-3d %5d %7d %d\n", id->h, wrote, last_page, TIMER_ELAPSED);
   SEEK(0);
   if( amt>0 ){
     return SQLITE_FULL;
@@ -941,7 +941,7 @@
   int s;
 
   assert( id->isOpen );
-  TRACE7("LOCK %d %s was %s(%s,%d) pid=%d\n", id->h, locktypeName(locktype), 
+  TRACE7("LOCK    %d %s was %s(%s,%d) pid=%d\n", id->h, locktypeName(locktype), 
       locktypeName(id->locktype), locktypeName(pLock->locktype), pLock->cnt
       ,getpid() );
 
@@ -950,7 +950,7 @@
   ** sqlite3OsEnterMutex() hasn't been called yet.
   */
   if( id->locktype>=locktype ){
-    TRACE3("LOCK %d %s ok (already held)\n", id->h, locktypeName(locktype));
+    TRACE3("LOCK    %d %s ok (already held)\n", id->h, locktypeName(locktype));
     return SQLITE_OK;
   }
 
@@ -1071,7 +1071,7 @@
 
 end_lock:
   sqlite3OsLeaveMutex();
-  TRACE4("LOCK %d %s %s\n", id->h, locktypeName(locktype), 
+  TRACE4("LOCK    %d %s %s\n", id->h, locktypeName(locktype), 
       rc==SQLITE_OK ? "ok" : "failed");
   return rc;
 }
@@ -1093,7 +1093,7 @@
   int rc = SQLITE_OK;
 
   assert( id->isOpen );
-  TRACE7("UNLOCK %d %d was %d(%d,%d) pid=%d\n", id->h, locktype, id->locktype, 
+  TRACE7("UNLOCK  %d %d was %d(%d,%d) pid=%d\n", id->h, locktype, id->locktype, 
       id->pLock->locktype, id->pLock->cnt, getpid());
 
   assert( locktype<=SHARED_LOCK );
--- sqlite/os_win.c
+++ sqlite/os_win.c
@@ -18,6 +18,10 @@
 
 #include <winbase.h>
 
+#ifdef __CYGWIN__
+# include <sys/cygwin.h>
+#endif
+
 /*
 ** Macros used to determine whether or not to use threads.
 */
@@ -703,10 +707,17 @@
   char *zNotUsed;
   char *zFull;
   int nByte;
+#ifdef __CYGWIN__
+  nByte = strlen(zRelative) + MAX_PATH + 1001;
+  zFull = sqliteMalloc( nByte );
+  if( zFull==0 ) return 0;
+  if( cygwin_conv_to_full_win32_path(zRelative, zFull) ) return 0;
+#else
   nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1;
   zFull = sqliteMalloc( nByte );
   if( zFull==0 ) return 0;
   GetFullPathNameA(zRelative, nByte, zFull, &zNotUsed);
+#endif
   return zFull;
 }
 
--- sqlite/pager.c
+++ sqlite/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.194 2005/03/15 17:09:30 drh Exp $
+** @(#) $Id: pager.c,v 1.201 2005/03/28 18:04:28 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -213,9 +213,16 @@
 
 /*
 ** How big to make the hash table used for locating in-memory pages
-** by page number.
+** by page number. This macro looks a little silly, but is evaluated
+** at compile-time, not run-time (at least for gcc this is true).
 */
-#define N_PG_HASH 2048
+#define N_PG_HASH (\
+  (MAX_PAGES>1024)?2048: \
+  (MAX_PAGES>512)?1024: \
+  (MAX_PAGES>256)?512: \
+  (MAX_PAGES>128)?256: \
+  (MAX_PAGES>64)?128:64 \
+)
 
 /*
 ** Hash a page number
@@ -244,6 +251,7 @@
   int pageSize;               /* Number of bytes in a page */
   int psAligned;              /* pageSize rounded up to a multiple of 8 */
   int nPage;                  /* Total number of in-memory pages */
+  int nMaxPage;               /* High water mark of nPage */
   int nRef;                   /* Number of in-memory pages with PgHdr.nRef>0 */
   int mxPage;                 /* Maximum number of pages to hold in cache */
   int nHit, nMiss, nOvfl;     /* Cache hits, missing, and LRU overflows */
@@ -822,6 +830,7 @@
 */
 static void pager_reset(Pager *pPager){
   PgHdr *pPg, *pNext;
+  if( pPager->errMask ) return;
   for(pPg=pPager->pAll; pPg; pPg=pNext){
     pNext = pPg->pNextAll;
     sqliteFree(pPg);
@@ -843,6 +852,29 @@
 }
 
 /*
+** This function is used to reset the pager after a malloc() failure. This
+** doesn't work with in-memory databases. If a malloc() fails when an 
+** in-memory database is in use it is not possible to recover.
+**
+** If a transaction or statement transaction is active, it is rolled back.
+**
+** It is an error to call this function if any pages are in use.
+*/
+#ifndef SQLITE_OMIT_GLOBALRECOVER
+int sqlite3pager_reset(Pager *pPager){
+  if( pPager ){
+    if( pPager->nRef || MEMDB ){
+      return SQLITE_ERROR;
+    }
+    pPager->errMask &= ~(PAGER_ERR_MEM);
+    pager_reset(pPager);
+  }
+  return SQLITE_OK;
+}
+#endif
+
+
+/*
 ** When this routine is called, the pager has the journal file open and
 ** a RESERVED or EXCLUSIVE lock on the database.  This routine releases
 ** the database lock and acquires a SHARED lock in its place.  The journal
@@ -881,6 +913,7 @@
     pPager->dirtyCache = 0;
     pPager->nRec = 0;
   }else{
+    assert( pPager->aInJournal==0 );
     assert( pPager->dirtyCache==0 || pPager->useJournal==0 );
   }
   rc = sqlite3OsUnlock(&pPager->fd, SHARED_LOCK);
@@ -935,6 +968,12 @@
   u32 cksum;                    /* Checksum used for sanity checking */
   u8 aData[SQLITE_MAX_PAGE_SIZE];  /* Temp storage for a page */
 
+  /* useCksum should be true for the main journal and false for
+  ** statement journals.  Verify that this is always the case
+  */
+  assert( jfd == (useCksum ? &pPager->jfd : &pPager->stfd) );
+
+
   rc = read32bits(jfd, &pgno);
   if( rc!=SQLITE_OK ) return rc;
   rc = sqlite3OsRead(jfd, &aData, pPager->pageSize);
@@ -969,13 +1008,27 @@
   **
   ** If in EXCLUSIVE state, then we update the pager cache if it exists
   ** and the main file. The page is then marked not dirty.
+  **
+  ** Ticket #1171:  The statement journal might contain page content that is
+  ** different from the page content at the start of the transaction.
+  ** This occurs when a page is changed prior to the start of a statement
+  ** then changed again within the statement.  When rolling back such a
+  ** statement we must not write to the original database unless we know
+  ** for certain that original page contents are in the main rollback
+  ** journal.  Otherwise, if a full ROLLBACK occurs after the statement
+  ** rollback the full ROLLBACK will not restore the page to its original
+  ** content.  Two conditions must be met before writing to the database
+  ** files. (1) the database must be locked.  (2) we know that the original
+  ** page content is in the main journal either because the page is not in
+  ** cache or else it is marked as needSync==0.
   */
   pPg = pager_lookup(pPager, pgno);
-  assert( pPager->state>=PAGER_EXCLUSIVE || pPg );
+  assert( pPager->state>=PAGER_EXCLUSIVE || pPg!=0 );
   TRACE3("PLAYBACK %d page %d\n", PAGERID(pPager), pgno);
-  if( pPager->state>=PAGER_EXCLUSIVE ){
+  if( pPager->state>=PAGER_EXCLUSIVE && (pPg==0 || pPg->needSync==0) ){
     sqlite3OsSeek(&pPager->fd, (pgno-1)*(i64)pPager->pageSize);
     rc = sqlite3OsWrite(&pPager->fd, aData, pPager->pageSize);
+    if( pPg ) pPg->dirty = 0;
   }
   if( pPg ){
     /* No page should ever be explicitly rolled back that is in use, except
@@ -991,13 +1044,9 @@
     if( pPager->xDestructor ){  /*** FIX ME:  Should this be xReinit? ***/
       pPager->xDestructor(pData, pPager->pageSize);
     }
-    if( pPager->state>=PAGER_EXCLUSIVE ){
-      pPg->dirty = 0;
-      pPg->needSync = 0;
 #ifdef SQLITE_CHECK_PAGES
-      pPg->pageHash = pager_pagehash(pPg);
+    pPg->pageHash = pager_pagehash(pPg);
 #endif
-    }
     CODEC(pPager, pData, pPg->pgno, 3);
   }
   return rc;
@@ -1614,6 +1663,7 @@
   pPager->stmtSize = 0;
   pPager->stmtJSize = 0;
   pPager->nPage = 0;
+  pPager->nMaxPage = 0;
   pPager->mxPage = 100;
   pPager->state = PAGER_UNLOCK;
   pPager->errMask = 0;
@@ -1905,7 +1955,7 @@
       if( !MEMDB ){
         sqlite3OsUnlock(&pPager->fd, NO_LOCK);
       }
-      assert( pPager->journalOpen==0 );
+      assert( pPager->errMask || pPager->journalOpen==0 );
       break;
     }
     case PAGER_SHARED: {
@@ -1932,8 +1982,15 @@
     sqliteFree(pPg);
   }
   TRACE2("CLOSE %d\n", PAGERID(pPager));
+  assert( pPager->errMask || (pPager->journalOpen==0 && pPager->stmtOpen==0) );
+  if( pPager->journalOpen ){
+    sqlite3OsClose(&pPager->jfd);
+  }
+  sqliteFree(pPager->aInJournal);
+  if( pPager->stmtOpen ){
+    sqlite3OsClose(&pPager->stfd);
+  }
   sqlite3OsClose(&pPager->fd);
-  assert( pPager->journalOpen==0 );
   /* Temp files are automatically deleted by the OS
   ** if( pPager->tempFile ){
   **   sqlite3OsDelete(pPager->zFilename);
@@ -2322,9 +2379,6 @@
                               + sizeof(u32) + pPager->nExtra
                               + MEMDB*sizeof(PgHistory) );
       if( pPg==0 ){
-        if( !MEMDB ){
-          pager_unwritelock(pPager);
-        }
         pPager->errMask |= PAGER_ERR_MEM;
         return SQLITE_NOMEM;
       }
@@ -2336,6 +2390,10 @@
       pPg->pNextAll = pPager->pAll;
       pPager->pAll = pPg;
       pPager->nPage++;
+      if( pPager->nPage>pPager->nMaxPage ){
+        assert( pPager->nMaxPage==(pPager->nPage-1) );
+        pPager->nMaxPage++;
+      }
     }else{
       /* Find a page to recycle.  Try to locate a page that does not
       ** require us to do an fsync() on the journal.
@@ -2562,6 +2620,7 @@
   assert( pPager->state>=PAGER_RESERVED );
   assert( pPager->journalOpen==0 );
   assert( pPager->useJournal );
+  assert( pPager->aInJournal==0 );
   sqlite3pager_pagecount(pPager);
   pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 );
   if( pPager->aInJournal==0 ){
@@ -2585,7 +2644,7 @@
   pPager->nRec = 0;
   if( pPager->errMask!=0 ){
     rc = pager_errcode(pPager);
-    return rc;
+    goto failed_to_open_journal;
   }
   pPager->origDbSize = pPager->dbSize;
 
--- sqlite/pager.h
+++ sqlite/pager.h
@@ -13,7 +13,7 @@
 ** subsystem.  The page cache subsystem reads and writes a file a page
 ** at a time and provides a journal for rollback.
 **
-** @(#) $Id: pager.h,v 1.41 2005/02/06 02:45:42 drh Exp $
+** @(#) $Id: pager.h,v 1.42 2005/03/21 04:04:03 danielk1977 Exp $
 */
 
 /*
@@ -100,6 +100,7 @@
 int sqlite3pager_rename(Pager*, const char *zNewName);
 void sqlite3pager_set_codec(Pager*,void(*)(void*,void*,Pgno,int),void*);
 int sqlite3pager_movepage(Pager*,void*,Pgno);
+int sqlite3pager_reset(Pager*);
 
 #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
 int sqlite3pager_lockstate(Pager*);
--- sqlite/parse.c
+++ sqlite/parse.c
@@ -93,35 +93,35 @@
 **                       defined, then do no error processing.
 */
 #define YYCODETYPE unsigned char
-#define YYNOCODE 239
+#define YYNOCODE 243
 #define YYACTIONTYPE unsigned short int
 #define sqlite3ParserTOKENTYPE Token
 typedef union {
   sqlite3ParserTOKENTYPE yy0;
-  struct AttachKey yy40;
-  int yy60;
-  struct TrigEvent yy62;
-  struct {int value; int mask;} yy243;
-  struct LikeOp yy258;
-  ExprList* yy266;
-  IdList* yy272;
-  Select* yy331;
-  struct LimitVal yy348;
-  Token yy406;
-  SrcList* yy427;
-  Expr* yy454;
-  TriggerStep* yy455;
-  int yy477;
+  struct LikeOp yy30;
+  Select* yy91;
+  struct AttachKey yy92;
+  IdList* yy232;
+  struct {int value; int mask;} yy319;
+  ExprList* yy322;
+  int yy328;
+  struct TrigEvent yy378;
+  struct LimitVal yy388;
+  Expr* yy418;
+  Token yy430;
+  SrcList* yy439;
+  TriggerStep* yy451;
+  int yy485;
 } YYMINORTYPE;
 #define YYSTACKDEPTH 100
 #define sqlite3ParserARG_SDECL Parse *pParse;
 #define sqlite3ParserARG_PDECL ,Parse *pParse
 #define sqlite3ParserARG_FETCH Parse *pParse = yypParser->pParse
 #define sqlite3ParserARG_STORE yypParser->pParse = pParse
-#define YYNSTATE 564
-#define YYNRULE 305
-#define YYERRORSYMBOL 141
-#define YYERRSYMDT yy477
+#define YYNSTATE 569
+#define YYNRULE 309
+#define YYERRORSYMBOL 143
+#define YYERRSYMDT yy485
 #define YYFALLBACK 1
 #define YY_NO_ACTION      (YYNSTATE+YYNRULE+2)
 #define YY_ACCEPT_ACTION  (YYNSTATE+YYNRULE+1)
@@ -176,480 +176,480 @@
 */
 static const YYACTIONTYPE yy_action[] = {
  /*     0 */   263,    9,  261,  154,  124,  126,  128,  130,  132,  134,
- /*    10 */   136,  138,  140,  142,    3,  562,  145,  641,   83,  369,
- /*    20 */   144,  114,  116,  112,  118,  286,  124,  126,  128,  130,
+ /*    10 */   136,  138,  140,  142,  406,    2,  145,  646,    4,  369,
+ /*    20 */   144,  114,  116,  112,  118,  849,  124,  126,  128,  130,
  /*    30 */   132,  134,  136,  138,  140,  142,  136,  138,  140,  142,
  /*    40 */   110,   94,  146,  157,  162,  167,  156,  161,  120,  122,
- /*    50 */   114,  116,  112,  118,  567,  124,  126,  128,  130,  132,
- /*    60 */   134,  136,  138,  140,  142,    7,  223,  407,  262,  124,
- /*    70 */   126,  128,  130,  132,  134,  136,  138,  140,  142,  399,
- /*    80 */   309,  145,  870,    1,  563,  144,  398,    4,  371,   92,
- /*    90 */   435,  373,  380,  385,  132,  134,  136,  138,  140,  142,
- /*   100 */   279,   10,  415,  388,  410,  110,   94,  146,  157,  162,
- /*   110 */   167,  156,  161,  120,  122,  114,  116,  112,  118,   96,
+ /*    50 */   114,  116,  112,  118,  572,  124,  126,  128,  130,  132,
+ /*    60 */   134,  136,  138,  140,  142,  579,  223,  533,  262,  124,
+ /*    70 */   126,  128,  130,  132,  134,  136,  138,  140,  142,    7,
+ /*    80 */    96,  145,   13,  535,  536,  144,  442,   78,  371,   92,
+ /*    90 */   453,  373,  380,  385,  132,  134,  136,  138,  140,  142,
+ /*   100 */    75,    3,  567,  388,  296,  110,   94,  146,  157,  162,
+ /*   110 */   167,  156,  161,  120,  122,  114,  116,  112,  118,   77,
  /*   120 */   124,  126,  128,  130,  132,  134,  136,  138,  140,  142,
- /*   130 */   145,  574,   77,   13,  144,  152,  222,  163,  168,   75,
- /*   140 */    44,   45,  367,  176,  280,  258,  839,   28,   13,  281,
- /*   150 */   402,   33,  233,   13,  110,   94,  146,  157,  162,  167,
- /*   160 */   156,  161,  120,  122,  114,  116,  112,  118,  572,  124,
- /*   170 */   126,  128,  130,  132,  134,  136,  138,  140,  142,  421,
- /*   180 */   371,  298,  720,  373,  380,  385,  107,  106,  108,  107,
- /*   190 */   106,  108,  169,  217,  295,  388,   13,  575,  471,   14,
- /*   200 */    15,  371,  175,  145,  373,  380,  385,  144,    2,  343,
- /*   210 */   346,    4,  292,   13,   14,   15,  388,  423,  345,   14,
- /*   220 */    15,  345,   95,  261,   12,   95,  802,  110,   94,  146,
+ /*   130 */   145,   10,  578,   13,  144,   11,  279,  569,  371,    6,
+ /*   140 */     5,  373,  380,  385,  358,   25,    3,  567,   14,   15,
+ /*   150 */   426,  507,  233,  388,  110,   94,  146,  157,  162,  167,
+ /*   160 */   156,  161,  120,  122,  114,  116,  112,  118,   77,  124,
+ /*   170 */   126,  128,  130,  132,  134,  136,  138,  140,  142,  577,
+ /*   180 */   280,  258,  407,   77,  159,  281,  107,  106,  108,  107,
+ /*   190 */   106,  108,  879,    1,  568,  172,  295,    4,  670,   14,
+ /*   200 */    15,  371,  175,  145,  373,  380,  385,  144,  518,  343,
+ /*   210 */   346,   16,   17,   18,  158,  367,  388,  415,  345,  410,
+ /*   220 */    28,  345,   95,  402,   33,   95,  807,  110,   94,  146,
  /*   230 */   157,  162,  167,  156,  161,  120,  122,  114,  116,  112,
  /*   240 */   118,   51,  124,  126,  128,  130,  132,  134,  136,  138,
- /*   250 */   140,  142,   36,  340,  800,  101,  102,  103,  101,  102,
- /*   260 */   103,  335,   14,   15,  847,  152,  188,  163,  168,   37,
- /*   270 */   341,   40,   59,   67,   69,  305,  336,  145,  265,   14,
- /*   280 */    15,  144,  171,  338,  173,  174,  351,  356,  357,  262,
- /*   290 */   171,   34,  173,  174,  366,  349,   51,   72,  460,  244,
+ /*   250 */   140,  142,   44,   45,  805,  101,  102,  103,  101,  102,
+ /*   260 */   103,  852,  152,  222,  163,  168,  188,  261,   72,   37,
+ /*   270 */   341,   40,   59,   67,   69,  305,  336,  145,  265,   36,
+ /*   280 */   340,  144,  806,  338,  171,   13,  173,  174,  335,   27,
+ /*   290 */   171,  403,  173,  174,   12,  460,   51,  313,  320,  322,
  /*   300 */   197,  110,   94,  146,  157,  162,  167,  156,  161,  120,
  /*   310 */   122,  114,  116,  112,  118,  288,  124,  126,  128,  130,
  /*   320 */   132,  134,  136,  138,  140,  142,   40,   59,   67,   69,
- /*   330 */   305,  336,  152,   13,  163,  168,  248,  258,  338,   96,
- /*   340 */    96,  145,   16,   17,   18,  144,  687,  170,  358,    6,
- /*   350 */     5,  494,  466,  456,  171,   25,  173,  174,   20,   75,
- /*   360 */    75,  507,   81,  176,  176,  110,   94,  146,  157,  162,
+ /*   330 */   305,  336,  152,  262,  163,  168,  580,  263,  338,  261,
+ /*   340 */    96,  145,  364,  362,  387,  144,   52,  170,  494,  466,
+ /*   350 */   456,   14,   15,  645,  171,   31,  173,  174,   54,   81,
+ /*   360 */    75,  331,  534,  601,  176,  110,   94,  146,  157,  162,
  /*   370 */   167,  156,  161,  120,  122,  114,  116,  112,  118,   77,
  /*   380 */   124,  126,  128,  130,  132,  134,  136,  138,  140,  142,
- /*   390 */   364,  362,  596,   77,  623,  367,  327,   48,  297,   14,
- /*   400 */    15,  243,  213,   32,   33,   96,   49,  688,   96,  250,
- /*   410 */   534,   96,  278,  217,  217,  145,   13,   50,  518,  144,
- /*   420 */    46,   52,  354,  356,  357,   75,  368,  401,   75,  190,
- /*   430 */    47,   75,  235,   54,  171,  235,  173,  174,  211,  110,
+ /*   390 */   152,  367,  163,  168,  325,   57,   58,   48,  297,   32,
+ /*   400 */    33,  195,  213,  207,   96,  262,   49,   96,   26,   96,
+ /*   410 */    13,   83,   96,   13,  217,  145,  265,   50,  286,  144,
+ /*   420 */    46,  169,  368,  401,   75,   13,  367,   75,  176,   75,
+ /*   430 */    47,  235,   75,  235,  565,   33,  176,  332,  211,  110,
  /*   440 */    94,  146,  157,  162,  167,  156,  161,  120,  122,  114,
- /*   450 */   116,  112,  118,  387,  124,  126,  128,  130,  132,  134,
- /*   460 */   136,  138,  140,  142,  303,   13,   48,  227,  236,   13,
- /*   470 */    96,  229,   96,   64,  294,   49,  191,  252,  293,  406,
- /*   480 */    96,  145,   14,   15,  358,  144,   50,   78,  564,  201,
- /*   490 */    75,  580,   75,  801,  176,  588,  493,    3,  562,  152,
- /*   500 */    75,  163,  168,  251,  296,  110,   94,  146,  157,  162,
+ /*   450 */   116,  112,  118,  266,  124,  126,  128,  130,  132,  134,
+ /*   460 */   136,  138,  140,  142,  303,   13,  298,  229,  227,  236,
+ /*   470 */    96,  692,  292,   48,  243,   96,   14,   15,  217,   14,
+ /*   480 */    15,  145,   49,  822,  278,  144,  217,  455,   13,   20,
+ /*   490 */    75,   14,   15,   50,  190,   75,  201,   13,   65,  176,
+ /*   500 */    13,  250,  593,  253,   66,  110,   94,  146,  157,  162,
  /*   510 */   167,  156,  161,  120,  122,  114,  116,  112,  118,   77,
  /*   520 */   124,  126,  128,  130,  132,  134,  136,  138,  140,  142,
- /*   530 */   660,   14,   15,   96,   81,   14,   15,  817,  489,   96,
- /*   540 */   310,   39,  250,  263,  216,  261,  145,  487,  533,  335,
- /*   550 */   144,  442,  350,   75,   13,  453,  261,  302,  253,   75,
- /*   560 */   852,  397,  255,  493,  535,  536,  573,  499,  850,   11,
+ /*   530 */   665,   14,   15,  693,  585,  250,  351,  356,  357,  871,
+ /*   540 */   152,  191,  163,  168,  479,  628,  145,  327,   34,  216,
+ /*   550 */   144,  366,  349,   22,   14,   15,   13,  331,  255,  171,
+ /*   560 */   461,  173,  174,   14,   15,  463,   14,   15,  857,  252,
  /*   570 */   110,   94,  146,  157,  162,  167,  156,  161,  120,  122,
- /*   580 */   114,  116,  112,  118,  845,  124,  126,  128,  130,  132,
- /*   590 */   134,  136,  138,  140,  142,   65,  662,  171,  312,  173,
- /*   600 */   174,   66,  505,  338,  501,  525,  866,   57,   58,   42,
- /*   610 */   252,  262,  195,  145,  207,  172,  441,  144,  665,  455,
- /*   620 */    14,   15,  262,   13,  640,  358,   31,  726,  313,  320,
- /*   630 */   322,  421,  171,  844,  173,  174,  251,  110,   94,  146,
+ /*   580 */   114,  116,  112,  118,  850,  124,  126,  128,  130,  132,
+ /*   590 */   134,  136,  138,  140,  142,  251,  855,  273,  358,  187,
+ /*   600 */   354,  356,  357,  252,  171,  310,  173,  174,   39,   42,
+ /*   610 */   350,  399,  309,  145,  261,  829,  335,  144,  398,  455,
+ /*   620 */   586,  294,   14,   15,   64,  293,  397,  667,  537,  251,
+ /*   630 */   499,   77,  171,  328,  173,  174,  731,  110,   94,  146,
  /*   640 */   157,  162,  167,  156,  161,  120,  122,  114,  116,  112,
  /*   650 */   118,   77,  124,  126,  128,  130,  132,  134,  136,  138,
- /*   660 */   140,  142,  171,   96,  173,  174,  432,  434,  433,  500,
- /*   670 */   171,  318,  173,  174,  581,   96,  479,   27,  145,  403,
- /*   680 */   310,  824,  144,   75,  455,   22,  503,   91,  246,   14,
- /*   690 */    15,  319,  461,  452,  537,   75,  582,  463,  171,   93,
+ /*   660 */   140,  142,  358,  312,   96,  505,   96,  501,  338,   96,
+ /*   670 */   171,   96,  173,  174,  441,  845,  479,   24,  145,  532,
+ /*   680 */   262,  275,  144,  331,   75,  214,   75,  215,  493,   75,
+ /*   690 */   302,   75,  465,  493,  272,   91,  273,  463,  171,  694,
  /*   700 */   173,  174,  110,   94,  146,  157,  162,  167,  156,  161,
- /*   710 */   120,  122,  114,  116,  112,  118,   77,  124,  126,  128,
- /*   720 */   130,  132,  134,  136,  138,  140,  142,  265,   96,  171,
- /*   730 */    96,  173,  174,  331,  810,   96,   96,  214,  312,  215,
- /*   740 */   275,  479,  272,  145,  273,  532,  315,  144,   75,  299,
- /*   750 */    75,  215,  109,  348,  111,   75,   75,  465,  426,  113,
- /*   760 */   115,  342,  463,  265,  266,  187,  325,  110,  165,  146,
+ /*   710 */   120,  122,  114,  116,  112,  118,  376,  124,  126,  128,
+ /*   720 */   130,  132,  134,  136,  138,  140,  142,  587,   96,  171,
+ /*   730 */   489,  173,  174,   96,   96,  525,   96,  246,  171,  271,
+ /*   740 */   173,  174,   96,  145,  432,  434,  433,  144,   75,  503,
+ /*   750 */   588,  452,   93,   75,   75,  348,   75,  109,  111,  332,
+ /*   760 */   113,  265,   75,  342,  248,  258,  115,  110,  165,  146,
  /*   770 */   157,  162,  167,  156,  161,  120,  122,  114,  116,  112,
- /*   780 */   118,  247,  124,  126,  128,  130,  132,  134,  136,  138,
- /*   790 */   140,  142,   26,   96,   96,   96,   96,   77,  271,  159,
- /*   800 */   283,   96,   96,   96,   96,  326,  275,  327,  145,  332,
- /*   810 */   364,  362,  144,   75,   75,   75,   75,  117,  119,  121,
- /*   820 */   123,   75,   75,   75,   75,  125,  127,  129,  131,  158,
- /*   830 */   317,  316,   24,   94,  146,  157,  162,  167,  156,  161,
+ /*   780 */   118,   29,  124,  126,  128,  130,  132,  134,  136,  138,
+ /*   790 */   140,  142,  815,   96,   96,   96,   96,  299,  283,  215,
+ /*   800 */   310,   96,   96,   96,   96,  364,  362,  219,  145,  317,
+ /*   810 */   316,  275,  144,   75,   75,   75,   75,  117,  119,  121,
+ /*   820 */   123,   75,   75,   75,   75,  125,  127,  129,  131,  352,
+ /*   830 */   247,  353,  404,   94,  146,  157,  162,  167,  156,  161,
  /*   840 */   120,  122,  114,  116,  112,  118,   96,  124,  126,  128,
- /*   850 */   130,  132,  134,  136,  138,  140,  142,   96,  331,   96,
- /*   860 */    96,  331,   96,  331,  436,   96,   75,   96,   96,  273,
- /*   870 */   133,  360,  361,   96,  145,   96,  583,   75,  144,   75,
+ /*   850 */   130,  132,  134,  136,  138,  140,  142,   96,  312,   96,
+ /*   860 */    96,  331,   96,  331,   77,   96,   75,   96,   96,  436,
+ /*   870 */   133,   30,  261,   96,  145,   96,   38,   75,  144,   75,
  /*   880 */    75,  135,   75,  137,  139,   75,  141,   75,   75,  143,
- /*   890 */   689,  153,  155,   75,  376,   75,  382,  164,  331,  166,
+ /*   890 */   592,  153,  155,   75,  382,   75,  391,  164,  331,  166,
  /*   900 */   146,  157,  162,  167,  156,  161,  120,  122,  114,  116,
- /*   910 */   112,  118,  261,  124,  126,  128,  130,  132,  134,  136,
- /*   920 */   138,  140,  142,   76,   96,   96,  438,   71,  457,  437,
- /*   930 */    96,  391,   29,   96,  328,   96,   96,  332,  352,  332,
- /*   940 */   353,  439,  148,  689,   75,   75,  147,  840,  178,  180,
- /*   950 */    75,  199,   96,   75,  182,   75,   75,  184,  652,  196,
- /*   960 */   198,  107,  106,  108,  383,  720,  327,  177,  404,  860,
- /*   970 */   150,  151,   75,   30,  332,   96,  208,  392,  262,  327,
- /*   980 */   430,  431,  476,  219,  183,  181,  300,   96,   96,  587,
- /*   990 */    96,  654,  179,   73,   74,   75,   96,   95,  149,  210,
- /*  1000 */    77,   96,  290,   96,   96,  331,  546,   75,   75,   76,
- /*  1010 */    75,  212,  224,   71,  240,  689,   75,  548,  414,   96,
- /*  1020 */   245,   75,   75,   75,   75,  277,  287,  386,  427,  219,
- /*  1030 */   101,  102,  103,  104,  105,  185,  189,  199,  449,   75,
- /*  1040 */    96,  275,   96,  474,  450,  470,  327,  107,  106,  108,
- /*  1050 */    77,  219,   42,  177,  458,   45,  484,  486,  273,  492,
- /*  1060 */    75,  490,   75,  476,  478,  522,  491,   35,  421,  421,
- /*  1070 */   183,  181,  421,  421,  421,  421,  421,   81,  179,   73,
- /*  1080 */    74,  332,  244,   95,  526,   38,  490,   42,   41,   77,
- /*  1090 */   523,   43,   53,   56,   55,   60,   64,   77,   70,  483,
- /*  1100 */    61,   76,   81,   62,   63,   71,  502,  504,   68,  597,
- /*  1110 */   506,  510,  514,  520,  558,  598,  101,  102,  103,  104,
- /*  1120 */   105,  185,  189,   79,   81,   80,  516,  244,  241,  199,
- /*  1130 */    82,   84,  239,  225,   85,   90,   97,   86,   98,  107,
- /*  1140 */   106,  108,   87,   89,   88,  177,   99,  100,  142,  160,
- /*  1150 */   218,  186,  666,  667,  668,  194,  209,  200,  203,  202,
- /*  1160 */   206,  205,  183,  181,  204,  192,  220,  193,  221,  219,
- /*  1170 */   179,   73,   74,  228,  232,   95,  226,  230,  231,  233,
- /*  1180 */   234,  237,  215,  257,  242,  238,  249,  276,  260,  267,
- /*  1190 */   254,  256,  259,   76,  264,  269,  268,   71,  270,  284,
- /*  1200 */   274,  282,  291,  301,  285,  306,  304,  324,  101,  102,
- /*  1210 */   103,  104,  105,  185,  189,  803,  311,  355,  307,  374,
- /*  1220 */   375,  199,  308,  309,  359,  337,  314,  321,  329,  330,
- /*  1230 */   363,  107,  106,  108,  333,  323,  372,  177,  344,  334,
- /*  1240 */   347,  365,  378,  379,  381,  339,  389,  377,  384,  390,
- /*  1250 */   393,  400,  394,  370,  183,  181,  289,  395,  408,  396,
- /*  1260 */    54,  409,  179,   73,   74,  411,  412,   95,  413,  416,
- /*  1270 */   417,  420,  422,  428,  832,  429,  440,  837,  838,   76,
- /*  1280 */   443,  444,  445,   71,  446,  451,  448,  808,  809,  459,
- /*  1290 */   418,  454,  447,  727,  728,  831,  462,  464,  846,  457,
- /*  1300 */   101,  102,  103,  104,  105,  185,  189,  199,  467,  468,
- /*  1310 */   469,  475,  419,  472,  424,  473,  848,  107,  106,  108,
- /*  1320 */   477,  425,  480,  177,  482,  485,  488,  481,  849,  495,
- /*  1330 */   851,  659,  496,  661,  497,  816,  858,  511,  509,  719,
- /*  1340 */   183,  181,  722,  513,  515,  517,  725,  521,  179,   73,
- /*  1350 */    74,  519,  528,   95,  524,  818,  530,  819,  531,  820,
- /*  1360 */     8,  821,  822,  538,  539,   19,   21,   23,  405,  823,
- /*  1370 */   549,  542,  859,  544,  861,  543,  862,  547,  552,  540,
- /*  1380 */   541,  865,  545,  551,  555,  550,  101,  102,  103,  104,
- /*  1390 */   105,  185,  189,  554,  867,  557,  560,  559,  529,  561,
- /*  1400 */   460,  868,  545,  545,  545,  527,  545,  553,  545,  545,
- /*  1410 */   545,  545,  556,  545,  545,  545,  545,  545,  545,  545,
- /*  1420 */   545,  545,  545,  545,  545,  545,  545,  545,  545,  545,
- /*  1430 */   545,  545,  545,  545,  545,  545,  545,  545,  545,  545,
- /*  1440 */   545,  545,  545,  545,  545,  545,  545,  545,  545,  545,
- /*  1450 */   545,  545,  545,  508,  512,  456,  545,  545,  545,  498,
- /*  1460 */   545,  545,  545,  545,   81,
+ /*   910 */   112,  118,  725,  124,  126,  128,  130,  132,  134,  136,
+ /*   920 */   138,  140,  142,   76,   96,   96,  438,   71,  471,  437,
+ /*   930 */    96,  449,   96,   96,  326,   96,  327,  332,  262,  332,
+ /*   940 */    96,  439,  148,   42,   75,   75,  147,   35,  178,  180,
+ /*   950 */    75,  199,   75,   75,  182,   75,  184,  196,  694,  198,
+ /*   960 */    75,  107,  106,  108,  208,  430,  431,  177,  421,  657,
+ /*   970 */   150,  151,  360,  361,  332,   96,   96,  548,  383,  421,
+ /*   980 */   327,   96,  725,  318,  183,  181,  300,   96,   96,  450,
+ /*   990 */    96,  327,  179,   73,   74,   75,   75,   95,  149,  210,
+ /*  1000 */   212,   75,  290,  319,   96,  224,  558,   75,   75,   76,
+ /*  1010 */    75,  240,  245,   71,  277,  275,  435,  423,   96,   96,
+ /*  1020 */    96,   96,   75,  392,   75,  327,  287,  457,  386,  244,
+ /*  1030 */   101,  102,  103,  104,  105,  185,  189,  199,   75,   75,
+ /*  1040 */    75,   75,  427,  474,  478,  491,  694,  107,  106,  108,
+ /*  1050 */   559,  219,  414,  177,   81,  484,  562,  273,  315,  486,
+ /*  1060 */   219,  458,   45,   42,  492,  476,  490,  487,  421,  421,
+ /*  1070 */   183,  181,  844,  483,  421,  421,  421,  421,  179,   73,
+ /*  1080 */    74,  476,   81,   95,   77,  421,  526,  865,  490,   43,
+ /*  1090 */   659,   77,   41,   53,  522,  523,   56,   55,   60,  244,
+ /*  1100 */    61,   76,   81,   62,   64,   71,  500,  502,   70,  602,
+ /*  1110 */    68,   63,  504,  506,  510,  514,  101,  102,  103,  104,
+ /*  1120 */   105,  185,  189,  520,  546,  603,   77,   81,  470,  199,
+ /*  1130 */    79,   80,  875,  244,   82,  239,  241,   84,  225,  107,
+ /*  1140 */   106,  108,   85,   87,  516,  177,   86,   88,   90,   98,
+ /*  1150 */    89,   97,   99,  100,  142,  160,  218,  671,  672,  673,
+ /*  1160 */   186,  209,  183,  181,  194,  200,  203,  202,  192,  206,
+ /*  1170 */   179,   73,   74,  204,  205,   95,  221,  193,  219,  220,
+ /*  1180 */   226,  228,  232,  230,  231,  233,  242,  237,  234,  238,
+ /*  1190 */   215,  249,  254,   76,  257,  260,  276,   71,  256,  259,
+ /*  1200 */   264,  267,  269,  268,  270,  274,  282,  291,  101,  102,
+ /*  1210 */   103,  104,  105,  185,  189,  808,  285,  301,  304,  306,
+ /*  1220 */   284,  199,  324,  311,  355,  330,  307,  374,  308,  329,
+ /*  1230 */   375,  107,  106,  108,  333,  309,  337,  177,  314,  334,
+ /*  1240 */   372,  321,  344,  323,  378,  347,  381,  379,  365,  359,
+ /*  1250 */   339,  389,  377,  400,  183,  181,  289,  384,  363,  390,
+ /*  1260 */   370,  393,  179,   73,   74,  394,  395,   95,   54,  396,
+ /*  1270 */   408,  409,  411,  412,  413,  416,  420,  417,  422,   76,
+ /*  1280 */   428,  837,  429,   71,  443,  440,  444,  842,  843,  445,
+ /*  1290 */   446,  447,  451,  448,  813,  454,  814,  459,  462,  732,
+ /*  1300 */   101,  102,  103,  104,  105,  185,  189,  199,  836,  464,
+ /*  1310 */   851,  457,  467,  418,  468,  733,  469,  107,  106,  108,
+ /*  1320 */   424,  419,  475,  177,  473,  853,  472,  477,  425,  480,
+ /*  1330 */   481,  482,  488,  485,  854,  495,  497,  856,  496,  664,
+ /*  1340 */   183,  181,  666,  821,  863,  509,  511,  724,  179,   73,
+ /*  1350 */    74,  513,  727,   95,  517,  515,  519,  730,  521,  524,
+ /*  1360 */     8,  823,  528,  530,  824,   19,   21,   23,  405,  531,
+ /*  1370 */   825,  826,  827,  539,  538,  828,  549,  542,  543,  540,
+ /*  1380 */   541,  864,  544,  547,  866,  550,  101,  102,  103,  104,
+ /*  1390 */   105,  185,  189,  545,  867,  552,  870,  872,  529,  557,
+ /*  1400 */   460,  551,  555,  560,  554,  527,  873,  553,  561,  563,
+ /*  1410 */   564,  566,  556,  874,  553,  553,  553,  553,  553,  553,
+ /*  1420 */   553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+ /*  1430 */   553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+ /*  1440 */   553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+ /*  1450 */   553,  553,  553,  508,  512,  456,  553,  553,  553,  498,
+ /*  1460 */   553,  553,  553,  553,   81,
 };
 static const YYCODETYPE yy_lookahead[] = {
- /*     0 */    24,  148,   26,   78,   79,   80,   81,   82,   83,   84,
- /*    10 */    85,   86,   87,   88,    9,   10,   40,   23,  192,   25,
- /*    20 */    44,   74,   75,   76,   77,  199,   79,   80,   81,   82,
+ /*     0 */    24,  150,   26,   78,   79,   80,   81,   82,   83,   84,
+ /*    10 */    85,   86,   87,   88,  155,  146,   40,   23,  149,   25,
+ /*    20 */    44,   74,   75,   76,   77,   11,   79,   80,   81,   82,
  /*    30 */    83,   84,   85,   86,   87,   88,   85,   86,   87,   88,
  /*    40 */    64,   65,   66,   67,   68,   69,   70,   71,   72,   73,
  /*    50 */    74,   75,   76,   77,    9,   79,   80,   81,   82,   83,
- /*    60 */    84,   85,   86,   87,   88,    9,   25,   20,   92,   79,
- /*    70 */    80,   81,   82,   83,   84,   85,   86,   87,   88,  177,
- /*    80 */   178,   40,  142,  143,  144,   44,  184,  147,   94,   48,
- /*    90 */    47,   97,   98,   99,   83,   84,   85,   86,   87,   88,
- /*   100 */   157,  149,   55,  109,   57,   64,   65,   66,   67,   68,
- /*   110 */    69,   70,   71,   72,   73,   74,   75,   76,   77,  150,
+ /*    60 */    84,   85,   86,   87,   88,    9,   25,  152,   92,   79,
+ /*    70 */    80,   81,   82,   83,   84,   85,   86,   87,   88,    9,
+ /*    80 */   152,   40,   26,  168,  169,   44,  227,  159,   94,   48,
+ /*    90 */   231,   97,   98,   99,   83,   84,   85,   86,   87,   88,
+ /*   100 */   172,    9,   10,  109,  176,   64,   65,   66,   67,   68,
+ /*   110 */    69,   70,   71,   72,   73,   74,   75,   76,   77,  191,
  /*   120 */    79,   80,   81,   82,   83,   84,   85,   86,   87,   88,
- /*   130 */    40,    9,  189,   26,   44,  217,  218,  219,  220,  170,
- /*   140 */   186,  187,  150,  174,  201,  202,  103,  155,   26,  206,
- /*   150 */   158,  159,   26,   26,   64,   65,   66,   67,   68,   69,
- /*   160 */    70,   71,   72,   73,   74,   75,   76,   77,    9,   79,
- /*   170 */    80,   81,   82,   83,   84,   85,   86,   87,   88,  150,
- /*   180 */    94,  212,    9,   97,   98,   99,   60,   61,   62,   60,
- /*   190 */    61,   62,   22,  224,   23,  109,   26,    9,   25,   92,
- /*   200 */    93,   94,   23,   40,   97,   98,   99,   44,  144,   83,
- /*   210 */    84,  147,   85,   26,   92,   93,  109,  188,   92,   92,
- /*   220 */    93,   92,   96,   26,  150,   96,  136,   64,   65,   66,
+ /*   130 */    40,  151,    9,   26,   44,   12,  159,    0,   94,  147,
+ /*   140 */   148,   97,   98,   99,  229,  153,    9,   10,   92,   93,
+ /*   150 */   136,  159,   26,  109,   64,   65,   66,   67,   68,   69,
+ /*   160 */    70,   71,   72,   73,   74,   75,   76,   77,  191,   79,
+ /*   170 */    80,   81,   82,   83,   84,   85,   86,   87,   88,    9,
+ /*   180 */   203,  204,   20,  191,   66,  208,   60,   61,   62,   60,
+ /*   190 */    61,   62,  144,  145,  146,  112,   23,  149,  115,   92,
+ /*   200 */    93,   94,   23,   40,   97,   98,   99,   44,  216,   83,
+ /*   210 */    84,   13,   14,   15,   96,  152,  109,   55,   92,   57,
+ /*   220 */   157,   92,   96,  160,  161,   96,  136,   64,   65,   66,
  /*   230 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
  /*   240 */    77,   66,   79,   80,   81,   82,   83,   84,   85,   86,
- /*   250 */    87,   88,  168,  169,   17,  129,  130,  131,  129,  130,
- /*   260 */   131,  177,   92,   93,   17,  217,   23,  219,  220,   94,
- /*   270 */    95,   96,   97,   98,   99,  100,  101,   40,  163,   92,
- /*   280 */    93,   44,  111,  108,  113,  114,  165,  166,  167,   92,
- /*   290 */   111,  160,  113,  114,  163,  164,   66,   22,   51,  126,
+ /*   250 */    87,   88,  188,  189,   17,  129,  130,  131,  129,  130,
+ /*   260 */   131,   17,  219,  220,  221,  222,   23,   26,   22,   94,
+ /*   270 */    95,   96,   97,   98,   99,  100,  101,   40,  165,  170,
+ /*   280 */   171,   44,   17,  108,  111,   26,  113,  114,  179,   22,
+ /*   290 */   111,   24,  113,  114,  152,   51,   66,  104,  105,  106,
  /*   300 */   137,   64,   65,   66,   67,   68,   69,   70,   71,   72,
- /*   310 */    73,   74,   75,   76,   77,  200,   79,   80,   81,   82,
+ /*   310 */    73,   74,   75,   76,   77,  202,   79,   80,   81,   82,
  /*   320 */    83,   84,   85,   86,   87,   88,   96,   97,   98,   99,
- /*   330 */   100,  101,  217,   26,  219,  220,  201,  202,  108,  150,
- /*   340 */   150,   40,   13,   14,   15,   44,   23,  157,  227,  145,
- /*   350 */   146,  104,  105,  106,  111,  151,  113,  114,  149,  170,
- /*   360 */   170,  157,  115,  174,  174,   64,   65,   66,   67,   68,
- /*   370 */    69,   70,   71,   72,   73,   74,   75,   76,   77,  189,
+ /*   330 */   100,  101,  219,   92,  221,  222,    9,   24,  108,   26,
+ /*   340 */   152,   40,   83,   84,  173,   44,   96,  159,  104,  105,
+ /*   350 */   106,   92,   93,   23,  111,   25,  113,  114,  108,  115,
+ /*   360 */   172,  152,  103,  117,  176,   64,   65,   66,   67,   68,
+ /*   370 */    69,   70,   71,   72,   73,   74,   75,   76,   77,  191,
  /*   380 */    79,   80,   81,   82,   83,   84,   85,   86,   87,   88,
- /*   390 */    83,   84,  117,  189,   23,  150,   25,   18,   23,   92,
- /*   400 */    93,  212,  212,  158,  159,  150,   27,   23,  150,   25,
- /*   410 */   103,  150,   22,  224,  224,   40,   26,   38,  214,   44,
- /*   420 */    41,   96,  165,  166,  167,  170,  181,  182,  170,  174,
- /*   430 */    51,  170,  174,  108,  111,  174,  113,  114,  137,   64,
+ /*   390 */   219,  152,  221,  222,  185,   13,   14,   18,   23,  160,
+ /*   400 */   161,  136,  214,  138,  152,   92,   27,  152,  154,  152,
+ /*   410 */    26,  194,  152,   26,  226,   40,  165,   38,  201,   44,
+ /*   420 */    41,   22,  183,  184,  172,   26,  152,  172,  176,  172,
+ /*   430 */    51,  176,  172,  176,  160,  161,  176,  228,  137,   64,
  /*   440 */    65,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   450 */    75,   76,   77,  171,   79,   80,   81,   82,   83,   84,
- /*   460 */    85,   86,   87,   88,   23,   26,   18,  209,  210,   26,
- /*   470 */   150,  210,  150,  102,  112,   27,  221,   93,  116,  153,
- /*   480 */   150,   40,   92,   93,  227,   44,   38,  157,    0,   41,
- /*   490 */   170,    9,  170,   17,  174,    9,  174,    9,   10,  217,
- /*   500 */   170,  219,  220,  119,  174,   64,   65,   66,   67,   68,
- /*   510 */    69,   70,   71,   72,   73,   74,   75,   76,   77,  189,
+ /*   450 */    75,   76,   77,  202,   79,   80,   81,   82,   83,   84,
+ /*   460 */    85,   86,   87,   88,   23,   26,  214,  212,  211,  212,
+ /*   470 */   152,   23,   85,   18,  214,  152,   92,   93,  226,   92,
+ /*   480 */    93,   40,   27,    9,   22,   44,  226,  159,   26,  151,
+ /*   490 */   172,   92,   93,   38,  176,  172,   41,   26,   29,  176,
+ /*   500 */    26,   25,    9,  119,   35,   64,   65,   66,   67,   68,
+ /*   510 */    69,   70,   71,   72,   73,   74,   75,   76,   77,  191,
  /*   520 */    79,   80,   81,   82,   83,   84,   85,   86,   87,   88,
- /*   530 */     9,   92,   93,  150,  115,   92,   93,    9,  216,  150,
- /*   540 */    45,  169,   25,   24,  224,   26,   40,  128,  150,  177,
- /*   550 */    44,  225,   22,  170,   26,  229,   26,  174,  119,  170,
- /*   560 */     9,   66,  119,  174,  166,  167,    9,   20,    9,   12,
+ /*   530 */     9,   92,   93,   23,    9,   25,  167,  168,  169,    9,
+ /*   540 */   219,  223,  221,  222,  216,   23,   40,   25,  162,  226,
+ /*   550 */    44,  165,  166,  151,   92,   93,   26,  152,  119,  111,
+ /*   560 */   232,  113,  114,   92,   93,  237,   92,   93,    9,   93,
  /*   570 */    64,   65,   66,   67,   68,   69,   70,   71,   72,   73,
  /*   580 */    74,   75,   76,   77,   11,   79,   80,   81,   82,   83,
- /*   590 */    84,   85,   86,   87,   88,   29,    9,  111,  103,  113,
- /*   600 */   114,   35,   55,  108,   57,  216,    9,   13,   14,  103,
- /*   610 */    93,   92,  136,   40,  138,  112,   21,   44,  115,  157,
- /*   620 */    92,   93,   92,   26,   23,  227,   25,    9,  104,  105,
- /*   630 */   106,  150,  111,   11,  113,  114,  119,   64,   65,   66,
+ /*   590 */    84,   85,   86,   87,   88,  119,    9,   25,  229,  159,
+ /*   600 */   167,  168,  169,   93,  111,   45,  113,  114,  171,  103,
+ /*   610 */    22,  179,  180,   40,   26,    9,  179,   44,  186,  159,
+ /*   620 */     9,  112,   92,   93,  102,  116,   66,    9,   22,  119,
+ /*   630 */    20,  191,  111,  228,  113,  114,    9,   64,   65,   66,
  /*   640 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*   650 */    77,  189,   79,   80,   81,   82,   83,   84,   85,   86,
- /*   660 */    87,   88,  111,  150,  113,  114,  104,  105,  106,  188,
- /*   670 */   111,   32,  113,  114,    9,  150,  214,   22,   40,   24,
- /*   680 */    45,    9,   44,  170,  157,  149,  139,  174,   25,   92,
- /*   690 */    93,   52,  230,   98,   22,  170,    9,  235,  111,  174,
+ /*   650 */    77,  191,   79,   80,   81,   82,   83,   84,   85,   86,
+ /*   660 */    87,   88,  229,  103,  152,   55,  152,   57,  108,  152,
+ /*   670 */   111,  152,  113,  114,   21,  103,  216,  151,   40,   73,
+ /*   680 */    92,  152,   44,  152,  172,   23,  172,   25,  176,  172,
+ /*   690 */   176,  172,  232,  176,   23,  176,   25,  237,  111,    9,
  /*   700 */   113,  114,   64,   65,   66,   67,   68,   69,   70,   71,
- /*   710 */    72,   73,   74,   75,   76,   77,  189,   79,   80,   81,
- /*   720 */    82,   83,   84,   85,   86,   87,   88,  163,  150,  111,
- /*   730 */   150,  113,  114,  150,  139,  150,  150,   23,  103,   25,
- /*   740 */   150,  214,   23,   40,   25,   73,  107,   44,  170,   23,
- /*   750 */   170,   25,  174,  162,  174,  170,  170,  230,  136,  174,
- /*   760 */   174,  170,  235,  163,  200,  157,  183,   64,   65,   66,
+ /*   710 */    72,   73,   74,   75,   76,   77,  185,   79,   80,   81,
+ /*   720 */    82,   83,   84,   85,   86,   87,   88,    9,  152,  111,
+ /*   730 */   218,  113,  114,  152,  152,  218,  152,   25,  111,  210,
+ /*   740 */   113,  114,  152,   40,  104,  105,  106,   44,  172,  139,
+ /*   750 */     9,   98,  176,  172,  172,  164,  172,  176,  176,  228,
+ /*   760 */   176,  165,  172,  172,  203,  204,  176,   64,   65,   66,
  /*   770 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*   780 */    77,  118,   79,   80,   81,   82,   83,   84,   85,   86,
- /*   790 */    87,   88,  152,  150,  150,  150,  150,  189,  208,   66,
- /*   800 */   200,  150,  150,  150,  150,   23,  150,   25,   40,  226,
- /*   810 */    83,   84,   44,  170,  170,  170,  170,  174,  174,  174,
- /*   820 */   174,  170,  170,  170,  170,  174,  174,  174,  174,   96,
- /*   830 */    95,   96,  149,   65,   66,   67,   68,   69,   70,   71,
- /*   840 */    72,   73,   74,   75,   76,   77,  150,   79,   80,   81,
- /*   850 */    82,   83,   84,   85,   86,   87,   88,  150,  150,  150,
- /*   860 */   150,  150,  150,  150,  208,  150,  170,  150,  150,   25,
- /*   870 */   174,  129,  130,  150,   40,  150,    9,  170,   44,  170,
- /*   880 */   170,  174,  170,  174,  174,  170,  174,  170,  170,  174,
- /*   890 */    24,  174,  174,  170,  183,  170,  183,  174,  150,  174,
+ /*   780 */    77,  158,   79,   80,   81,   82,   83,   84,   85,   86,
+ /*   790 */    87,   88,  139,  152,  152,  152,  152,   23,  202,   25,
+ /*   800 */    45,  152,  152,  152,  152,   83,   84,  117,   40,   95,
+ /*   810 */    96,  152,   44,  172,  172,  172,  172,  176,  176,  176,
+ /*   820 */   176,  172,  172,  172,  172,  176,  176,  176,  176,   23,
+ /*   830 */   118,   25,  159,   65,   66,   67,   68,   69,   70,   71,
+ /*   840 */    72,   73,   74,   75,   76,   77,  152,   79,   80,   81,
+ /*   850 */    82,   83,   84,   85,   86,   87,   88,  152,  103,  152,
+ /*   860 */   152,  152,  152,  152,  191,  152,  172,  152,  152,  210,
+ /*   870 */   176,   23,   26,  152,   40,  152,  152,  172,   44,  172,
+ /*   880 */   172,  176,  172,  176,  176,  172,  176,  172,  172,  176,
+ /*   890 */     9,  176,  176,  172,  185,  172,  185,  176,  152,  176,
  /*   900 */    66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
- /*   910 */    76,   77,   26,   79,   80,   81,   82,   83,   84,   85,
- /*   920 */    86,   87,   88,   22,  150,  150,   28,   26,   64,   31,
- /*   930 */   150,  183,  156,  150,  226,  150,  150,  226,   23,  226,
- /*   940 */    25,   43,   40,    9,  170,  170,   44,  103,  174,  174,
- /*   950 */   170,   50,  150,  170,  174,  170,  170,  174,    9,  174,
- /*   960 */   174,   60,   61,   62,   23,    9,   25,   66,  157,    9,
- /*   970 */    68,   69,  170,   23,  226,  150,  174,   23,   92,   25,
- /*   980 */    53,   54,  150,  117,   83,   84,   85,  150,  150,    9,
- /*   990 */   150,  127,   91,   92,   93,  170,  150,   96,   96,  174,
- /*  1000 */   189,  150,  150,  150,  150,  150,   46,  170,  170,   22,
- /*  1010 */   170,  174,  174,   26,  174,  103,  170,  131,  157,  150,
- /*  1020 */   174,  170,  170,  170,  170,  174,  174,  174,  174,  117,
- /*  1030 */   129,  130,  131,  132,  133,  134,  135,   50,  183,  170,
- /*  1040 */   150,  150,  150,  174,   23,  213,   25,   60,   61,   62,
- /*  1050 */   189,  117,  103,   66,  186,  187,   23,  157,   25,   23,
- /*  1060 */   170,   25,  170,  150,  174,  157,  174,  161,  150,  150,
- /*  1070 */    83,   84,  150,  150,  150,  150,  150,  115,   91,   92,
- /*  1080 */    93,  226,  126,   96,   23,  150,   25,  103,  171,  189,
- /*  1090 */   128,   33,  171,   42,  180,   46,  102,  189,   22,  208,
- /*  1100 */   172,   22,  115,  171,  173,   26,  188,  188,  171,  117,
- /*  1110 */   188,  188,  188,  188,  188,  117,  129,  130,  131,  132,
- /*  1120 */   133,  134,  135,  190,  115,  189,  213,  126,  123,   50,
- /*  1130 */   191,  193,  124,  121,  194,  125,  117,  195,  150,   60,
- /*  1140 */    61,   62,  196,  198,  197,   66,  117,  150,   88,   96,
- /*  1150 */   150,   22,  115,  115,  115,   17,  136,   22,  187,   23,
- /*  1160 */    23,  150,   83,   84,   25,  222,  150,  223,  154,  117,
- /*  1170 */    91,   92,   93,   25,  101,   96,  122,  211,  172,   26,
- /*  1180 */   162,  211,   25,  119,  122,  172,  203,  103,  154,  204,
- /*  1190 */   150,  150,  150,   22,  150,  120,  205,   26,   22,  204,
- /*  1200 */   150,   23,  117,   23,  205,  150,  171,   22,  129,  130,
- /*  1210 */   131,  132,  133,  134,  135,  136,  150,   23,  175,   46,
- /*  1220 */    22,   50,  176,  178,  228,  162,  179,  179,  211,  172,
- /*  1230 */   228,   60,   61,   62,  211,  179,  150,   66,  170,  172,
- /*  1240 */   170,  163,   23,  171,   22,  180,   46,  173,  171,   22,
- /*  1250 */   100,  182,  150,  182,   83,   84,   85,  175,  150,  176,
- /*  1260 */   108,  154,   91,   92,   93,  150,  154,   96,   24,  150,
- /*  1270 */   154,  103,  154,   39,   11,   37,   47,  103,  103,   22,
- /*  1280 */   139,  150,  154,   26,  103,  171,   22,    9,  139,  185,
- /*  1290 */   231,   11,  150,  127,  127,    9,   17,    9,   17,   64,
- /*  1300 */   129,  130,  131,  132,  133,  134,  135,   50,  185,  150,
- /*  1310 */   107,  194,  232,  150,  233,   73,    9,   60,   61,   62,
- /*  1320 */    73,  234,  127,   66,   22,  215,   22,  150,    9,  118,
- /*  1330 */     9,    9,  150,    9,  194,    9,    9,  194,  118,    9,
- /*  1340 */    83,   84,    9,  185,  107,  194,    9,  215,   91,   92,
- /*  1350 */    93,  127,  150,   96,   22,    9,  150,    9,  154,    9,
- /*  1360 */    11,    9,    9,  150,   23,   16,   17,   18,   19,    9,
- /*  1370 */    34,  163,    9,  150,    9,   24,    9,  163,  150,   30,
- /*  1380 */   236,    9,  237,  236,  154,   36,  129,  130,  131,  132,
- /*  1390 */   133,  134,  135,  150,    9,   20,  140,   59,   49,  150,
- /*  1400 */    51,    9,  238,  238,  238,   56,  238,   58,  238,  238,
- /*  1410 */   238,  238,   63,  238,  238,  238,  238,  238,  238,  238,
- /*  1420 */   238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
- /*  1430 */   238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
- /*  1440 */   238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
- /*  1450 */   238,  238,  238,  104,  105,  106,  238,  238,  238,  110,
- /*  1460 */   238,  238,  238,  238,  115,
+ /*   910 */    76,   77,    9,   79,   80,   81,   82,   83,   84,   85,
+ /*   920 */    86,   87,   88,   22,  152,  152,   28,   26,   25,   31,
+ /*   930 */   152,  185,  152,  152,   23,  152,   25,  228,   92,  228,
+ /*   940 */   152,   43,   40,  103,  172,  172,   44,  163,  176,  176,
+ /*   950 */   172,   50,  172,  172,  176,  172,  176,  176,   24,  176,
+ /*   960 */   172,   60,   61,   62,  176,   53,   54,   66,  152,    9,
+ /*   970 */    68,   69,  129,  130,  228,  152,  152,  131,   23,  152,
+ /*   980 */    25,  152,    9,   32,   83,   84,   85,  152,  152,   23,
+ /*   990 */   152,   25,   91,   92,   93,  172,  172,   96,   96,  176,
+ /*  1000 */   176,  172,  152,   52,  152,  176,  190,  172,  172,   22,
+ /*  1010 */   172,  176,  176,   26,  176,  152,   47,  190,  152,  152,
+ /*  1020 */   152,  152,  172,   23,  172,   25,  176,   64,  176,  126,
+ /*  1030 */   129,  130,  131,  132,  133,  134,  135,   50,  172,  172,
+ /*  1040 */   172,  172,  176,  176,  176,  176,  103,   60,   61,   62,
+ /*  1050 */    59,  117,  159,   66,  115,   23,  240,   25,  107,  159,
+ /*  1060 */   117,  188,  189,  103,   23,  152,   25,  128,  152,  152,
+ /*  1070 */    83,   84,  103,  210,  152,  152,  152,  152,   91,   92,
+ /*  1080 */    93,  152,  115,   96,  191,  152,   23,    9,   25,   33,
+ /*  1090 */   127,  191,  173,  173,  159,  128,   42,  182,   46,  126,
+ /*  1100 */   174,   22,  115,  173,  102,   26,  190,  190,   22,  117,
+ /*  1110 */   173,  175,  190,  190,  190,  190,  129,  130,  131,  132,
+ /*  1120 */   133,  134,  135,  190,   46,  117,  191,  115,  215,   50,
+ /*  1130 */   192,  191,  141,  126,  193,  124,  123,  195,  121,   60,
+ /*  1140 */    61,   62,  196,  198,  215,   66,  197,  199,  125,  152,
+ /*  1150 */   200,  117,  117,  152,   88,   96,  152,  115,  115,  115,
+ /*  1160 */    22,  136,   83,   84,   17,   22,  189,   23,  224,   23,
+ /*  1170 */    91,   92,   93,   25,  152,   96,  156,  225,  117,  152,
+ /*  1180 */   122,   25,  101,  213,  174,   26,  122,  213,  164,  174,
+ /*  1190 */    25,  205,  152,   22,  119,  156,  103,   26,  152,  152,
+ /*  1200 */   152,  206,  120,  207,   22,  152,   23,  117,  129,  130,
+ /*  1210 */   131,  132,  133,  134,  135,  136,  207,   23,  173,  152,
+ /*  1220 */   206,   50,   22,  152,   23,  174,  177,   46,  178,  213,
+ /*  1230 */    22,   60,   61,   62,  213,  180,  164,   66,  181,  174,
+ /*  1240 */   152,  181,  172,  181,   23,  172,   22,  173,  165,  230,
+ /*  1250 */   182,   46,  175,  184,   83,   84,   85,  173,  230,   22,
+ /*  1260 */   184,  100,   91,   92,   93,  152,  177,   96,  108,  178,
+ /*  1270 */   152,  156,  152,  156,   24,  152,  103,  156,  156,   22,
+ /*  1280 */    39,   11,   37,   26,  139,   47,  152,  103,  103,  156,
+ /*  1290 */   103,  152,  173,   22,    9,   11,  139,  187,   17,  127,
+ /*  1300 */   129,  130,  131,  132,  133,  134,  135,   50,    9,    9,
+ /*  1310 */    17,   64,  187,  233,  152,  127,  107,   60,   61,   62,
+ /*  1320 */   235,  234,  196,   66,   73,    9,  152,   73,  236,  127,
+ /*  1330 */   152,   22,   22,  217,    9,  118,  196,    9,  152,    9,
+ /*  1340 */    83,   84,    9,    9,    9,  118,  196,    9,   91,   92,
+ /*  1350 */    93,  187,    9,   96,  196,  107,  127,    9,  217,   22,
+ /*  1360 */    11,    9,  152,  152,    9,   16,   17,   18,   19,  156,
+ /*  1370 */     9,    9,    9,   23,  152,    9,   34,  165,   24,   30,
+ /*  1380 */   238,    9,  152,  165,    9,   36,  129,  130,  131,  132,
+ /*  1390 */   133,  134,  135,  239,    9,  152,    9,    9,   49,   20,
+ /*  1400 */    51,  238,  156,  140,  152,   56,    9,   58,  152,  141,
+ /*  1410 */   241,  142,   63,    9,  242,  242,  242,  242,  242,  242,
+ /*  1420 */   242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+ /*  1430 */   242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+ /*  1440 */   242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+ /*  1450 */   242,  242,  242,  104,  105,  106,  242,  242,  242,  110,
+ /*  1460 */   242,  242,  242,  242,  115,
 };
 #define YY_SHIFT_USE_DFLT (-76)
 static const short yy_shift_ofst[] = {
- /*     0 */     5,  488,  -76,  -76, 1349,   45,   56,  -76,  329,  557,
- /*    10 */   159,  122,  188,  -76,  -76,  -76,  -76,  -76,  -76,  557,
- /*    20 */   482,  557,  665,  557,  687,  655,  867,  187,  601,  950,
- /*    30 */   980,  107,  -76,  197,  -76,  175,  -76,  187,  230,  -76,
- /*    40 */   984,  -76, 1058,  379,  -76,  -76,  -76,  -76,  -76,  -76,
- /*    50 */   -76,  325,  984,  -76, 1051,  -76,  594,  -76,  -76, 1049,
- /*    60 */   566,  984,  994,  -76,  -76,  -76,  -76,  984,  -76, 1076,
- /*    70 */  1257,  275,  901,  992,  998,  -76,  987,  -76,  171, 1009,
- /*    80 */   -76,  362,  -76,  663, 1001, 1005, 1008, 1012, 1010,  -76,
- /*    90 */  1257,   41, 1257,  638, 1257,  -76, 1019,  187, 1029,  187,
+ /*     0 */    92,  137,  -76,  -76, 1349,   45,   70,  -76,  198,  123,
+ /*    10 */   170,   56,  327,  -76,  -76,  -76,  -76,  -76,  -76,  123,
+ /*    20 */   525,  123,  611,  123,  718,  267,  741,  471,  330,  848,
+ /*    30 */   881,  107,  -76,  241,  -76,  175,  -76,  471,  230,  -76,
+ /*    40 */   840,  -76, 1056,  379,  -76,  -76,  -76,  -76,  -76,  -76,
+ /*    50 */   -76,  250,  840,  -76, 1054,  -76,  382,  -76,  -76, 1052,
+ /*    60 */   469,  840, 1002,  -76,  -76,  -76,  -76,  840,  -76, 1086,
+ /*    70 */  1257,  246,  901,  992, 1008,  -76,  987,  -76,  173, 1012,
+ /*    80 */   -76,  509,  -76,  712, 1007, 1013, 1011, 1017, 1023,  -76,
+ /*    90 */  1257,   41, 1257,  638, 1257,  -76, 1034,  471, 1035,  471,
  /*   100 */   -76,  -76,  -76,  -76,  -76,  -76,  -76,  -76,  -76,  834,
  /*   110 */  1257,  768, 1257,  -10, 1257,  -10, 1257,  -10, 1257,  -10,
  /*   120 */  1257,  -53, 1257,  -53, 1257,   11, 1257,   11, 1257,   11,
- /*   130 */  1257,   11, 1257,  -49, 1257,  -49, 1257, 1060, 1257, 1060,
- /*   140 */  1257, 1060, 1257,  -76,  -76,  -76,  902,  -76,  -76,  -76,
- /*   150 */   -76,  -76, 1257,  -75, 1257,  -10,  -76,  733,  -76, 1053,
- /*   160 */   -76,  -76,  -76, 1257,  703, 1257,  -53,  -76,  170,  987,
- /*   170 */   179,  503, 1037, 1038, 1039,  -76,  638, 1257,  834, 1257,
- /*   180 */   -76, 1257,  -76, 1257,  -76, 1129, 1009,  243,  -76, 1079,
- /*   190 */    90, 1020,  476, 1138,  -76, 1257,  163, 1257,  638, 1135,
- /*   200 */   448, 1136,  -76, 1139,  187, 1137,  -76, 1257,  237, 1257,
- /*   210 */   301, 1257,  638,  714,  -76, 1257,  -76,  -76, 1052,  187,
- /*   220 */   -76,  -76,  -76, 1257,  638, 1054, 1257, 1148, 1257, 1073,
- /*   230 */   566,  -76, 1153,  -76,  -76,  638, 1073,  566,  -76, 1257,
- /*   240 */   638, 1062, 1257, 1157, 1257,  638,  -76,  -76,  517,  -76,
- /*   250 */   -76,  -76,  439,  -76,  443,  -76, 1064,  -76,  390, 1052,
- /*   260 */   519,  -76,  -76,  187,  -76,  -76, 1084, 1075,  -76, 1176,
- /*   270 */   187,  719,  -76,  187,  -76,  -76, 1257,  638, 1009,  323,
- /*   280 */   384, 1178,  519, 1084, 1075,  -76, 1171,  -24,  -76,  -76,
- /*   290 */  1085,  127,  -76,  -76,  -76,  -76,  375,  -76,  726,  -76,
- /*   300 */  1180,  -76,  441,  984,  -76,  187, 1185,  -76,  635,  -76,
- /*   310 */   187,  -76,  524,  639,  -76,  735,  -76,  -76,  -76,  -76,
- /*   320 */   639,  -76,  639,  -76,  187,  782,  -76,  187, 1073,  566,
- /*   330 */   -76,  -76, 1073,  566,  -76,  -76, 1153,  -76, 1051,  -76,
- /*   340 */   -76,  126,  -76,  129,  -76,  -76,  129,  -76,  -76,  530,
- /*   350 */   727,  915,  -76,  727, 1194,  -76,  -76,  -76,  742,  -76,
- /*   360 */   -76,  -76,  742,  -76,  -76,  -76,  -76,  -76,   -6,   86,
- /*   370 */   -76,  187,  -76, 1173, 1198,  187,  371, 1219,  984,  -76,
- /*   380 */  1222,  187,  941,  984,  -76, 1257,  506,  -76, 1200, 1227,
- /*   390 */   187,  954, 1150,  187, 1185,  -76,  495, 1152,  -76,  -76,
- /*   400 */   -76,  -76,  -76, 1009,  486,  595,   47,  187, 1052,  -76,
- /*   410 */   187,  866, 1244, 1009,  521,  187, 1052,  898,  562, 1168,
- /*   420 */   187, 1052,  -76, 1234,  622, 1263, 1257,  573, 1238,  927,
- /*   430 */   -76,  -76, 1174, 1175,   43,  187,  844,  -76,  -76, 1229,
- /*   440 */   -76,  -76, 1141,  187,  912, 1181,  187, 1264,  187, 1021,
- /*   450 */   949, 1278, 1149, 1280,  247,  551,  864,  379,  -76, 1166,
- /*   460 */  1167, 1279, 1286, 1288,  247, 1281, 1235,  187, 1203,  187,
- /*   470 */   173,  187, 1242, 1257,  638, 1307, 1247, 1257,  638, 1195,
- /*   480 */   187, 1302,  187, 1033,  -76,  419,  559, 1304, 1257, 1036,
- /*   490 */  1257,  638, 1319,  638, 1211,  187,  956, 1321,  547,  187,
- /*   500 */  1322,  187, 1324,  187, 1326,  187, 1327,  587, 1220,  187,
- /*   510 */   956, 1330, 1235,  187, 1237,  187,  173, 1333, 1224,  187,
- /*   520 */  1302,  962,  618, 1332, 1257, 1061, 1337,  528, 1346,  187,
- /*   530 */  1052,  672,  307, 1348, 1350, 1352, 1353,  187, 1341, 1360,
- /*   540 */  1336,  197, 1351,  187,  960, 1363,  886, 1365, 1367,  -76,
- /*   550 */  1336,  187, 1372,  597,  934, 1385, 1375,  187, 1338, 1256,
- /*   560 */   187, 1392,  -76,  -76,
+ /*   130 */  1257,   11, 1257,  -49, 1257,  -49, 1257, 1066, 1257, 1066,
+ /*   140 */  1257, 1066, 1257,  -76,  -76,  -76,  902,  -76,  -76,  -76,
+ /*   150 */   -76,  -76, 1257,  -75, 1257,  -10,  -76,  118,  -76, 1059,
+ /*   160 */   -76,  -76,  -76, 1257,  703, 1257,  -53,  -76,  399,  987,
+ /*   170 */   179,   83, 1042, 1043, 1044,  -76,  638, 1257,  834, 1257,
+ /*   180 */   -76, 1257,  -76, 1257,  -76, 1138, 1012,  243,  -76, 1079,
+ /*   190 */    90, 1025,  265, 1147,  -76, 1257,  163, 1257,  638, 1143,
+ /*   200 */   455, 1144,  -76, 1148,  471, 1146,  -76, 1257,  237, 1257,
+ /*   210 */   301, 1257,  638,  662,  -76, 1257,  -76,  -76, 1061,  471,
+ /*   220 */   -76,  -76,  -76, 1257,  638, 1058, 1257, 1156, 1257, 1081,
+ /*   230 */   469,  -76, 1159,  -76,  -76,  638, 1081,  469,  -76, 1257,
+ /*   240 */   638, 1064, 1257, 1165, 1257,  638,  -76,  -76,  476,  -76,
+ /*   250 */   -76,  -76,  384,  -76,  439,  -76, 1075,  -76,  462, 1061,
+ /*   260 */   313,  -76,  -76,  471,  -76,  -76, 1093, 1082,  -76, 1182,
+ /*   270 */   471,  671,  -76,  471,  -76,  -76, 1257,  638, 1012,  448,
+ /*   280 */   510, 1183,  313, 1093, 1082,  -76, 1171,  -24,  -76,  -76,
+ /*   290 */  1090,  387,  -76,  -76,  -76,  -76,  375,  -76,  774,  -76,
+ /*   300 */  1194,  -76,  441,  840,  -76,  471, 1200,  -76,  755,  -76,
+ /*   310 */   471,  -76,  193,  951,  -76,  714,  -76,  -76,  -76,  -76,
+ /*   320 */   951,  -76,  951,  -76,  471,  911,  -76,  471, 1081,  469,
+ /*   330 */   -76,  -76, 1081,  469,  -76,  -76, 1159,  -76, 1054,  -76,
+ /*   340 */   -76,  126,  -76,  129,  -76,  -76,  129,  -76,  -76,  588,
+ /*   350 */   722,  806,  -76,  722, 1201,  -76,  -76,  -76,  843,  -76,
+ /*   360 */   -76,  -76,  843,  -76,  -76,  -76,  -76,  -76,   -6,   44,
+ /*   370 */   -76,  471,  -76, 1181, 1208,  471,  522, 1221,  840,  -76,
+ /*   380 */  1224,  471,  955,  840,  -76, 1257,  506,  -76, 1205, 1237,
+ /*   390 */   471, 1000, 1161,  471, 1200,  -76,  560, 1160,  -76,  -76,
+ /*   400 */   -76,  -76,  -76, 1012,  493,  653,  162,  471, 1061,  -76,
+ /*   410 */   471,  934, 1250, 1012,  521,  471, 1061,  898,  640, 1173,
+ /*   420 */   471, 1061,  -76, 1241,   14, 1270, 1257,  573, 1245,  912,
+ /*   430 */   -76,  -76, 1184, 1185,  969,  471,  572,  -76,  -76, 1238,
+ /*   440 */   -76,  -76, 1145,  471,  943, 1187,  471, 1271,  471,  966,
+ /*   450 */   960, 1285, 1157, 1284,  244,  559,  963,  379,  -76, 1172,
+ /*   460 */  1188, 1281, 1299, 1300,  244, 1293, 1247,  471, 1209,  471,
+ /*   470 */   903,  471, 1251, 1257,  638, 1316, 1254, 1257,  638, 1202,
+ /*   480 */   471, 1309,  471, 1032,  -76,  939,  587, 1310, 1257, 1041,
+ /*   490 */  1257,  638, 1325,  638, 1217,  471,  973, 1328,  610,  471,
+ /*   500 */  1330,  471, 1333,  471, 1334,  471, 1335,  618, 1227,  471,
+ /*   510 */   973, 1338, 1247,  471, 1248,  471,  903, 1343, 1229,  471,
+ /*   520 */  1309,  967,  627, 1337, 1257, 1063, 1348,  474, 1352,  471,
+ /*   530 */  1061,  606,  259, 1355, 1361, 1362, 1363,  471, 1350, 1366,
+ /*   540 */  1342,  241, 1354,  471, 1078, 1372,  846, 1375, 1385,  -76,
+ /*   550 */  1342,  471, 1387,  530,  690, 1388, 1379,  471,  991, 1263,
+ /*   560 */   471, 1397, 1268, 1269,  471, 1404,  -76,  -76,  -76,
 };
-#define YY_REDUCE_USE_DFLT (-175)
+#define YY_REDUCE_USE_DFLT (-150)
 static const short yy_reduce_ofst[] = {
- /*     0 */   -60,   64, -175, -175,  204, -175, -175, -175, -147,  -48,
- /*    10 */  -175,   74, -175, -175, -175, -175, -175, -175, -175,  209,
- /*    20 */  -175,  536, -175,  683, -175,  640, -175,   -8,  776, -175,
- /*    30 */  -175,  245, -175,  131,  906,   84, -175,  935,  372, -175,
- /*    40 */   917, -175, -175,  -46, -175, -175, -175, -175, -175, -175,
- /*    50 */  -175, -175,  921, -175,  914, -175, -175, -175, -175, -175,
- /*    60 */   928,  932,  931, -175, -175, -175, -175,  937, -175, -175,
- /*    70 */   383, -175,  -31, -175, -175, -175,  330, -175,  933,  936,
- /*    80 */  -175,  939, -174,  938,  940,  942,  946,  947,  945, -175,
- /*    90 */   513,   48,  525,   48,  578, -175, -175,  988, -175,  997,
- /*   100 */  -175, -175, -175, -175, -175, -175, -175, -175, -175,   48,
- /*   110 */   580,   48,  585,   48,  586,   48,  643,   48,  644,   48,
- /*   120 */   645,   48,  646,   48,  651,   48,  652,   48,  653,   48,
- /*   130 */   654,   48,  696,   48,  707,   48,  709,   48,  710,   48,
- /*   140 */   712,   48,  715,   48, -175, -175, -175, -175, -175, -175,
- /*   150 */  -175, -175,  717,  -82,  718,   48, -175, -175, -175, -175,
- /*   160 */  -175, -175, -175,  723,   48,  725,   48, -175, 1000,  190,
- /*   170 */   933, -175, -175, -175, -175, -175,   48,  774,   48,  775,
- /*   180 */    48,  780,   48,  783,   48, -175,  608,  933, -175,  255,
- /*   190 */    48,  943,  944, -175, -175,  785,   48,  786,   48, -175,
- /*   200 */   971, -175, -175, -175, 1011, -175, -175,  802,   48,  825,
- /*   210 */    48,  837,   48, -175, -175,  320, -175, -175, 1014, 1016,
- /*   220 */  -175, -175, -175,  838,   48, -175,  258, -175,  261,  966,
- /*   230 */  1006, -175, 1018, -175, -175,   48,  970, 1013, -175,  840,
- /*   240 */    48, -175,  189, -175,  846,   48, -175,  135,  983, -175,
- /*   250 */  -175, -175, 1040, -175, 1041, -175, -175, -175, 1042, 1034,
- /*   260 */   564, -175, -175, 1044, -175, -175,  985,  991, -175, -175,
- /*   270 */   590, -175, -175, 1050, -175, -175,  851,   48,  -57,  933,
- /*   280 */   983, -175,  600,  995,  999, -175,  852,  115, -175, -175,
- /*   290 */  -175,  988, -175, -175, -175, -175,   48, -175, -175, -175,
- /*   300 */  -175, -175,   48, 1035, -175, 1055, 1043, 1046, 1045, -175,
- /*   310 */  1066, -175, -175, 1047, -175, -175, -175, -175, -175, -175,
- /*   320 */  1048, -175, 1056, -175,  583, -175, -175,  708, 1017, 1057,
- /*   330 */  -175, -175, 1023, 1067, -175, -175, 1063, -175, 1065, -175,
- /*   340 */  -175,  591, -175, 1068, -175, -175, 1070, -175, -175, 1078,
- /*   350 */   121, -175, -175,  257, -175, -175, -175, -175,  996, -175,
- /*   360 */  -175, -175, 1002, -175, -175, -175, -175, -175, 1069, 1071,
- /*   370 */  -175, 1086, -175, -175, -175,  711, 1074, -175, 1072, -175,
- /*   380 */  -175,  713, -175, 1077, -175,  853,  282, -175, -175, -175,
- /*   390 */   748, -175, -175, 1102, 1082, 1083,  -98, -175, -175, -175,
- /*   400 */  -175, -175, -175,  811,  933,  326, -175, 1108, 1107, -175,
- /*   410 */  1115, 1112, -175,  861,  933, 1119, 1116, 1059, 1080, -175,
- /*   420 */    29, 1118, -175, 1081, 1087, -175,  854,   48, -175, -175,
- /*   430 */  -175, -175, -175, -175, -175,  656, -175, -175, -175, -175,
- /*   440 */  -175, -175, -175, 1131, 1128, -175, 1142, -175,  855, -175,
- /*   450 */  1114, -175, -175, -175,  462,  933, 1104,  868, -175, -175,
- /*   460 */  -175, -175, -175, -175,  527, -175, 1123, 1159, -175,  832,
- /*   470 */  1117, 1163, -175,  869,   48, -175, -175,  890,   48, -175,
- /*   480 */  1177, 1110,  891, -175, -175,  900,  933, -175,  322, -175,
- /*   490 */   892,   48, -175,   48, -175, 1182, 1140, -175, -175,  481,
- /*   500 */  -175,  918, -175,  919, -175,  922, -175,  933, -175,  923,
- /*   510 */  1143, -175, 1158,  924, -175,  913, 1151, -175, -175,  925,
- /*   520 */  1132,  908,  933, -175,  389, -175, -175, 1202, -175, 1206,
- /*   530 */  1204, -175,  398, -175, -175, -175, -175, 1213, -175, -175,
- /*   540 */  1144, 1208, -175, 1223, 1145, -175, 1214, -175, -175, -175,
- /*   550 */  1147, 1228, -175, 1243, 1230, -175, -175,  926, -175, -175,
- /*   560 */  1249, -175, -175, -175,
+ /*     0 */    48, -131, -150, -150,   -8, -150, -150, -150, -149,  -20,
+ /*    10 */  -150,  142, -150, -150, -150, -150, -150, -150, -150,  338,
+ /*    20 */  -150,  402, -150,  526, -150,  254, -150,   63,  623, -150,
+ /*    30 */  -150,  239, -150,  386,  784,  109, -150,  724,  437, -150,
+ /*    40 */   919, -150, -150,   64, -150, -150, -150, -150, -150, -150,
+ /*    50 */  -150, -150,  920, -150,  915, -150, -150, -150, -150, -150,
+ /*    60 */   926,  930,  936, -150, -150, -150, -150,  937, -150, -150,
+ /*    70 */   514, -150,  252, -150, -150, -150,  -72, -150,  938,  940,
+ /*    80 */  -150,  941,  217,  942,  946,  949,  945,  948,  950, -150,
+ /*    90 */   519,  321,  576,  321,  581, -150, -150,  997, -150, 1001,
+ /*   100 */  -150, -150, -150, -150, -150, -150, -150, -150, -150,  321,
+ /*   110 */   582,  321,  584,  321,  590,  321,  641,  321,  642,  321,
+ /*   120 */   643,  321,  644,  321,  649,  321,  650,  321,  651,  321,
+ /*   130 */   652,  321,  694,  321,  705,  321,  707,  321,  708,  321,
+ /*   140 */   710,  321,  713,  321, -150, -150, -150, -150, -150, -150,
+ /*   150 */  -150, -150,  715,   43,  716,  321, -150, -150, -150, -150,
+ /*   160 */  -150, -150, -150,  721,  321,  723,  321, -150, 1004,  188,
+ /*   170 */   938, -150, -150, -150, -150, -150,  321,  772,  321,  773,
+ /*   180 */   321,  778,  321,  780,  321, -150,  440,  938, -150,  318,
+ /*   190 */   321,  944,  952, -150, -150,  781,  321,  783,  321, -150,
+ /*   200 */   977, -150, -150, -150, 1022, -150, -150,  788,  321,  823,
+ /*   210 */   321,  824,  321, -150, -150,  323, -150, -150, 1020, 1027,
+ /*   220 */  -150, -150, -150,  829,  321, -150,  257, -150,  255,  970,
+ /*   230 */  1010, -150, 1024, -150, -150,  321,  974, 1015, -150,  835,
+ /*   240 */   321, -150,  260, -150,  836,  321, -150,  561,  986, -150,
+ /*   250 */  -150, -150, 1040, -150, 1046, -150, -150, -150, 1047, 1039,
+ /*   260 */   251, -150, -150, 1048, -150, -150,  995,  996, -150, -150,
+ /*   270 */   529, -150, -150, 1053, -150, -150,  838,  321,  -23,  938,
+ /*   280 */   986, -150,  596, 1014, 1009, -150,  850,  113, -150, -150,
+ /*   290 */  -150,  997, -150, -150, -150, -150,  321, -150, -150, -150,
+ /*   300 */  -150, -150,  321, 1045, -150, 1067, 1049, 1050, 1055, -150,
+ /*   310 */  1071, -150, -150, 1057, -150, -150, -150, -150, -150, -150,
+ /*   320 */  1060, -150, 1062, -150,  209, -150, -150,  405, 1016, 1051,
+ /*   330 */  -150, -150, 1021, 1065, -150, -150, 1072, -150, 1068, -150,
+ /*   340 */  -150,  591, -150, 1070, -150, -150, 1073, -150, -150, 1083,
+ /*   350 */   369, -150, -150,  433, -150, -150, -150, -150, 1019, -150,
+ /*   360 */  -150, -150, 1028, -150, -150, -150, -150, -150, 1069, 1076,
+ /*   370 */  -150, 1088, -150, -150, -150,  531, 1077, -150, 1074, -150,
+ /*   380 */  -150,  709, -150, 1084, -150,  852,  171, -150, -150, -150,
+ /*   390 */   711, -150, -150, 1113, 1089, 1091,  432, -150, -150, -150,
+ /*   400 */  -150, -150, -150,  673,  938, -141, -150, 1118, 1115, -150,
+ /*   410 */  1120, 1117, -150,  893,  938, 1123, 1121, 1080, 1087, -150,
+ /*   420 */   827, 1122, -150, 1085, 1092, -150,  866,  321, -150, -150,
+ /*   430 */  -150, -150, -150, -150, -150,  659, -150, -150, -150, -150,
+ /*   440 */  -150, -150, -150, 1134, 1133, -150, 1139, -150,  746, -150,
+ /*   450 */  1119, -150, -150, -150,  328,  938, 1110,  873, -150, -150,
+ /*   460 */  -150, -150, -150, -150,  460, -150, 1125, 1162, -150,  913,
+ /*   470 */  1126, 1174, -150,  867,  321, -150, -150,  868,  321, -150,
+ /*   480 */  1178, 1116,  863, -150, -150,  900,  938, -150,  512, -150,
+ /*   490 */   869,  321, -150,  321, -150, 1186, 1140, -150, -150,  916,
+ /*   500 */  -150,  917, -150,  922, -150,  923, -150,  938, -150,  924,
+ /*   510 */  1150, -150, 1164,  925, -150,  929, 1158, -150, -150,  933,
+ /*   520 */  1141,  935,  938, -150,  517, -150, -150, 1210, -150, 1211,
+ /*   530 */  1213, -150,  -85, -150, -150, -150, -150, 1222, -150, -150,
+ /*   540 */  1142, 1212, -150, 1230, 1154, -150, 1218, -150, -150, -150,
+ /*   550 */  1163, 1243, -150, 1252, 1246, -150, -150,  816, -150, -150,
+ /*   560 */  1256, -150, -150, 1169,  274, -150, -150, -150, -150,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */   570,  570,  565,  568,  869,  869,  869,  569,  576,  869,
- /*    10 */   869,  869,  869,  596,  597,  598,  577,  578,  579,  869,
- /*    20 */   869,  869,  869,  869,  869,  869,  869,  869,  869,  869,
- /*    30 */   869,  869,  589,  599,  608,  591,  607,  869,  869,  609,
- /*    40 */   652,  615,  869,  869,  653,  656,  657,  658,  855,  856,
- /*    50 */   857,  869,  652,  616,  637,  635,  869,  638,  639,  869,
- /*    60 */   708,  652,  623,  617,  624,  706,  707,  652,  618,  869,
- /*    70 */   869,  738,  807,  744,  739,  735,  869,  663,  869,  869,
- /*    80 */   664,  672,  674,  681,  720,  711,  713,  701,  715,  669,
- /*    90 */   869,  716,  869,  717,  869,  737,  869,  869,  740,  869,
- /*   100 */   741,  742,  743,  745,  746,  747,  750,  751,  752,  753,
- /*   110 */   869,  754,  869,  755,  869,  756,  869,  757,  869,  758,
- /*   120 */   869,  759,  869,  760,  869,  761,  869,  762,  869,  763,
- /*   130 */   869,  764,  869,  765,  869,  766,  869,  767,  869,  768,
- /*   140 */   869,  769,  869,  770,  771,  772,  869,  773,  774,  781,
- /*   150 */   788,  791,  869,  776,  869,  775,  778,  869,  779,  869,
- /*   160 */   782,  780,  787,  869,  869,  869,  789,  790,  869,  807,
- /*   170 */   869,  869,  869,  869,  869,  794,  806,  869,  783,  869,
- /*   180 */   784,  869,  785,  869,  786,  869,  869,  869,  796,  869,
- /*   190 */   869,  869,  869,  869,  797,  869,  869,  869,  798,  869,
- /*   200 */   869,  869,  853,  869,  869,  869,  854,  869,  869,  869,
- /*   210 */   869,  869,  799,  869,  792,  807,  804,  805,  689,  869,
- /*   220 */   690,  795,  777,  869,  718,  869,  869,  702,  869,  709,
- /*   230 */   708,  703,  869,  593,  710,  705,  709,  708,  704,  869,
- /*   240 */   714,  869,  807,  712,  869,  721,  673,  684,  682,  683,
- /*   250 */   692,  693,  869,  694,  869,  695,  869,  696,  869,  689,
- /*   260 */   680,  594,  595,  869,  678,  679,  698,  700,  685,  869,
- /*   270 */   869,  869,  699,  869,  733,  734,  869,  697,  684,  869,
- /*   280 */   869,  869,  680,  698,  700,  686,  869,  680,  675,  676,
- /*   290 */   869,  869,  677,  670,  671,  793,  869,  736,  869,  748,
- /*   300 */   869,  749,  869,  652,  619,  869,  811,  625,  620,  626,
- /*   310 */   869,  627,  869,  869,  628,  869,  631,  632,  633,  634,
- /*   320 */   869,  629,  869,  630,  869,  869,  812,  869,  709,  708,
- /*   330 */   813,  815,  709,  708,  814,  621,  869,  622,  637,  636,
- /*   340 */   610,  869,  611,  869,  612,  744,  869,  613,  614,  600,
- /*   350 */   830,  869,  601,  830,  869,  602,  605,  606,  869,  825,
- /*   360 */   827,  828,  869,  826,  829,  604,  603,  592,  869,  869,
- /*   370 */   642,  869,  645,  869,  869,  869,  869,  869,  652,  646,
- /*   380 */   869,  869,  869,  652,  647,  869,  652,  648,  869,  869,
- /*   390 */   869,  869,  869,  869,  811,  625,  650,  869,  649,  651,
- /*   400 */   643,  644,  590,  869,  869,  586,  869,  869,  689,  584,
- /*   410 */   869,  869,  869,  869,  869,  869,  689,  836,  869,  869,
- /*   420 */   869,  689,  691,  841,  869,  869,  869,  869,  869,  869,
- /*   430 */   842,  843,  869,  869,  869,  869,  869,  833,  834,  869,
- /*   440 */   835,  585,  869,  869,  869,  869,  869,  869,  869,  869,
- /*   450 */   869,  869,  869,  869,  869,  869,  869,  869,  655,  869,
- /*   460 */   869,  869,  869,  869,  869,  869,  654,  869,  869,  869,
- /*   470 */   869,  869,  869,  869,  723,  869,  869,  869,  724,  869,
- /*   480 */   869,  731,  869,  869,  732,  869,  869,  869,  869,  869,
- /*   490 */   869,  729,  869,  730,  869,  869,  869,  869,  869,  869,
- /*   500 */   869,  869,  869,  869,  869,  869,  869,  869,  869,  869,
- /*   510 */   869,  869,  654,  869,  869,  869,  869,  869,  869,  869,
- /*   520 */   731,  869,  869,  869,  869,  869,  869,  869,  869,  869,
- /*   530 */   689,  869,  830,  869,  869,  869,  869,  869,  869,  869,
- /*   540 */   864,  869,  869,  869,  869,  869,  869,  869,  869,  863,
- /*   550 */   864,  869,  869,  869,  869,  869,  869,  869,  869,  869,
- /*   560 */   869,  869,  571,  566,
+ /*     0 */   575,  575,  570,  573,  878,  878,  878,  574,  581,  878,
+ /*    10 */   878,  878,  878,  601,  602,  603,  582,  583,  584,  878,
+ /*    20 */   878,  878,  878,  878,  878,  878,  878,  878,  878,  878,
+ /*    30 */   878,  878,  594,  604,  613,  596,  612,  878,  878,  614,
+ /*    40 */   657,  620,  878,  878,  658,  661,  662,  663,  860,  861,
+ /*    50 */   862,  878,  657,  621,  642,  640,  878,  643,  644,  878,
+ /*    60 */   713,  657,  628,  622,  629,  711,  712,  657,  623,  878,
+ /*    70 */   878,  743,  812,  749,  744,  740,  878,  668,  878,  878,
+ /*    80 */   669,  677,  679,  686,  725,  716,  718,  706,  720,  674,
+ /*    90 */   878,  721,  878,  722,  878,  742,  878,  878,  745,  878,
+ /*   100 */   746,  747,  748,  750,  751,  752,  755,  756,  757,  758,
+ /*   110 */   878,  759,  878,  760,  878,  761,  878,  762,  878,  763,
+ /*   120 */   878,  764,  878,  765,  878,  766,  878,  767,  878,  768,
+ /*   130 */   878,  769,  878,  770,  878,  771,  878,  772,  878,  773,
+ /*   140 */   878,  774,  878,  775,  776,  777,  878,  778,  779,  786,
+ /*   150 */   793,  796,  878,  781,  878,  780,  783,  878,  784,  878,
+ /*   160 */   787,  785,  792,  878,  878,  878,  794,  795,  878,  812,
+ /*   170 */   878,  878,  878,  878,  878,  799,  811,  878,  788,  878,
+ /*   180 */   789,  878,  790,  878,  791,  878,  878,  878,  801,  878,
+ /*   190 */   878,  878,  878,  878,  802,  878,  878,  878,  803,  878,
+ /*   200 */   878,  878,  858,  878,  878,  878,  859,  878,  878,  878,
+ /*   210 */   878,  878,  804,  878,  797,  812,  809,  810,  694,  878,
+ /*   220 */   695,  800,  782,  878,  723,  878,  878,  707,  878,  714,
+ /*   230 */   713,  708,  878,  598,  715,  710,  714,  713,  709,  878,
+ /*   240 */   719,  878,  812,  717,  878,  726,  678,  689,  687,  688,
+ /*   250 */   697,  698,  878,  699,  878,  700,  878,  701,  878,  694,
+ /*   260 */   685,  599,  600,  878,  683,  684,  703,  705,  690,  878,
+ /*   270 */   878,  878,  704,  878,  738,  739,  878,  702,  689,  878,
+ /*   280 */   878,  878,  685,  703,  705,  691,  878,  685,  680,  681,
+ /*   290 */   878,  878,  682,  675,  676,  798,  878,  741,  878,  753,
+ /*   300 */   878,  754,  878,  657,  624,  878,  816,  630,  625,  631,
+ /*   310 */   878,  632,  878,  878,  633,  878,  636,  637,  638,  639,
+ /*   320 */   878,  634,  878,  635,  878,  878,  817,  878,  714,  713,
+ /*   330 */   818,  820,  714,  713,  819,  626,  878,  627,  642,  641,
+ /*   340 */   615,  878,  616,  878,  617,  749,  878,  618,  619,  605,
+ /*   350 */   835,  878,  606,  835,  878,  607,  610,  611,  878,  830,
+ /*   360 */   832,  833,  878,  831,  834,  609,  608,  597,  878,  878,
+ /*   370 */   647,  878,  650,  878,  878,  878,  878,  878,  657,  651,
+ /*   380 */   878,  878,  878,  657,  652,  878,  657,  653,  878,  878,
+ /*   390 */   878,  878,  878,  878,  816,  630,  655,  878,  654,  656,
+ /*   400 */   648,  649,  595,  878,  878,  591,  878,  878,  694,  589,
+ /*   410 */   878,  878,  878,  878,  878,  878,  694,  841,  878,  878,
+ /*   420 */   878,  694,  696,  846,  878,  878,  878,  878,  878,  878,
+ /*   430 */   847,  848,  878,  878,  878,  878,  878,  838,  839,  878,
+ /*   440 */   840,  590,  878,  878,  878,  878,  878,  878,  878,  878,
+ /*   450 */   878,  878,  878,  878,  878,  878,  878,  878,  660,  878,
+ /*   460 */   878,  878,  878,  878,  878,  878,  659,  878,  878,  878,
+ /*   470 */   878,  878,  878,  878,  728,  878,  878,  878,  729,  878,
+ /*   480 */   878,  736,  878,  878,  737,  878,  878,  878,  878,  878,
+ /*   490 */   878,  734,  878,  735,  878,  878,  878,  878,  878,  878,
+ /*   500 */   878,  878,  878,  878,  878,  878,  878,  878,  878,  878,
+ /*   510 */   878,  878,  659,  878,  878,  878,  878,  878,  878,  878,
+ /*   520 */   736,  878,  878,  878,  878,  878,  878,  878,  878,  878,
+ /*   530 */   694,  878,  835,  878,  878,  878,  878,  878,  878,  878,
+ /*   540 */   869,  878,  878,  878,  878,  878,  878,  878,  878,  868,
+ /*   550 */   869,  878,  878,  878,  878,  878,  878,  878,  878,  878,
+ /*   560 */   878,  878,  878,  876,  878,  878,  877,  576,  571,
 };
 #define YY_SZ_ACTTAB (sizeof(yy_action)/sizeof(yy_action[0]))
 
@@ -806,6 +806,8 @@
     0,  /*       ELSE => nothing */
     0,  /*      INDEX => nothing */
     0,  /*         TO => nothing */
+    0,  /*        ADD => nothing */
+    0,  /*   COLUMNKW => nothing */
 };
 #endif /* YYFALLBACK */
 
@@ -911,31 +913,32 @@
   "VALUES",        "INTEGER",       "FLOAT",         "BLOB",        
   "REGISTER",      "VARIABLE",      "EXISTS",        "CASE",        
   "WHEN",          "THEN",          "ELSE",          "INDEX",       
-  "TO",            "error",         "input",         "cmdlist",     
-  "ecmd",          "cmdx",          "cmd",           "explain",     
-  "transtype",     "trans_opt",     "nm",            "create_table",
-  "create_table_args",  "temp",          "dbnm",          "columnlist",  
-  "conslist_opt",  "select",        "column",        "columnid",    
-  "type",          "carglist",      "id",            "ids",         
-  "typename",      "signed",        "plus_num",      "minus_num",   
-  "carg",          "ccons",         "term",          "onconf",      
-  "sortorder",     "autoinc",       "expr",          "idxlist_opt", 
-  "refargs",       "defer_subclause",  "refarg",        "refact",      
-  "init_deferred_pred_opt",  "conslist",      "tcons",         "idxlist",     
-  "defer_subclause_opt",  "orconf",        "resolvetype",   "raisetype",   
-  "fullname",      "oneselect",     "multiselect_op",  "distinct",    
-  "selcollist",    "from",          "where_opt",     "groupby_opt", 
-  "having_opt",    "orderby_opt",   "limit_opt",     "sclp",        
-  "as",            "seltablist",    "stl_prefix",    "joinop",      
-  "on_opt",        "using_opt",     "seltablist_paren",  "joinop2",     
-  "inscollist",    "sortlist",      "sortitem",      "collate",     
-  "exprlist",      "setlist",       "insert_cmd",    "inscollist_opt",
-  "itemlist",      "likeop",        "escape",        "between_op",  
-  "in_op",         "case_operand",  "case_exprlist",  "case_else",   
-  "expritem",      "uniqueflag",    "idxitem",       "plus_opt",    
-  "number",        "trigger_decl",  "trigger_cmd_list",  "trigger_time",
-  "trigger_event",  "foreach_clause",  "when_clause",   "trigger_cmd", 
-  "database_kw_opt",  "key_opt",     
+  "TO",            "ADD",           "COLUMNKW",      "error",       
+  "input",         "cmdlist",       "ecmd",          "cmdx",        
+  "cmd",           "explain",       "transtype",     "trans_opt",   
+  "nm",            "create_table",  "create_table_args",  "temp",        
+  "dbnm",          "columnlist",    "conslist_opt",  "select",      
+  "column",        "columnid",      "type",          "carglist",    
+  "id",            "ids",           "typename",      "signed",      
+  "plus_num",      "minus_num",     "carg",          "ccons",       
+  "term",          "onconf",        "sortorder",     "autoinc",     
+  "expr",          "idxlist_opt",   "refargs",       "defer_subclause",
+  "refarg",        "refact",        "init_deferred_pred_opt",  "conslist",    
+  "tcons",         "idxlist",       "defer_subclause_opt",  "orconf",      
+  "resolvetype",   "raisetype",     "fullname",      "oneselect",   
+  "multiselect_op",  "distinct",      "selcollist",    "from",        
+  "where_opt",     "groupby_opt",   "having_opt",    "orderby_opt", 
+  "limit_opt",     "sclp",          "as",            "seltablist",  
+  "stl_prefix",    "joinop",        "on_opt",        "using_opt",   
+  "seltablist_paren",  "joinop2",       "inscollist",    "sortlist",    
+  "sortitem",      "collate",       "exprlist",      "setlist",     
+  "insert_cmd",    "inscollist_opt",  "itemlist",      "likeop",      
+  "escape",        "between_op",    "in_op",         "case_operand",
+  "case_exprlist",  "case_else",     "expritem",      "uniqueflag",  
+  "idxitem",       "plus_opt",      "number",        "trigger_decl",
+  "trigger_cmd_list",  "trigger_time",  "trigger_event",  "foreach_clause",
+  "when_clause",   "trigger_cmd",   "database_kw_opt",  "key_opt",     
+  "add_column_fullname",  "kwcolumn_opt",
 };
 #endif /* NDEBUG */
 
@@ -1248,6 +1251,10 @@
  /* 302 */ "cmd ::= REINDEX",
  /* 303 */ "cmd ::= REINDEX nm dbnm",
  /* 304 */ "cmd ::= ALTER TABLE fullname RENAME TO nm",
+ /* 305 */ "cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt column",
+ /* 306 */ "add_column_fullname ::= fullname",
+ /* 307 */ "kwcolumn_opt ::=",
+ /* 308 */ "kwcolumn_opt ::= COLUMNKW",
 };
 #endif /* NDEBUG */
 
@@ -1305,73 +1312,73 @@
     ** which appear on the RHS of the rule, but which are not used
     ** inside the C code.
     */
-    case 157:
-    case 189:
-    case 206:
-#line 325 "parse.y"
-{sqlite3SelectDelete((yypminor->yy331));}
-#line 1315 "parse.c"
+    case 159:
+    case 191:
+    case 208:
+#line 334 "parse.y"
+{sqlite3SelectDelete((yypminor->yy91));}
+#line 1322 "parse.c"
       break;
-    case 170:
-    case 174:
-    case 194:
+    case 172:
+    case 176:
     case 196:
-    case 204:
-    case 210:
-    case 224:
-#line 584 "parse.y"
-{sqlite3ExprDelete((yypminor->yy454));}
-#line 1326 "parse.c"
+    case 198:
+    case 206:
+    case 212:
+    case 226:
+#line 593 "parse.y"
+{sqlite3ExprDelete((yypminor->yy418));}
+#line 1333 "parse.c"
       break;
-    case 175:
-    case 183:
-    case 192:
-    case 195:
+    case 177:
+    case 185:
+    case 194:
     case 197:
     case 199:
-    case 209:
-    case 212:
-    case 213:
-    case 216:
-    case 222:
-#line 803 "parse.y"
-{sqlite3ExprListDelete((yypminor->yy266));}
-#line 1341 "parse.c"
+    case 201:
+    case 211:
+    case 214:
+    case 215:
+    case 218:
+    case 224:
+#line 812 "parse.y"
+{sqlite3ExprListDelete((yypminor->yy322));}
+#line 1348 "parse.c"
       break;
-    case 188:
-    case 193:
-    case 201:
-    case 202:
-#line 454 "parse.y"
-{sqlite3SrcListDelete((yypminor->yy427));}
-#line 1349 "parse.c"
+    case 190:
+    case 195:
+    case 203:
+    case 204:
+#line 463 "parse.y"
+{sqlite3SrcListDelete((yypminor->yy439));}
+#line 1356 "parse.c"
       break;
-    case 198:
-#line 516 "parse.y"
+    case 200:
+#line 525 "parse.y"
 {
-  sqlite3ExprDelete((yypminor->yy348).pLimit);
-  sqlite3ExprDelete((yypminor->yy348).pOffset);
+  sqlite3ExprDelete((yypminor->yy388).pLimit);
+  sqlite3ExprDelete((yypminor->yy388).pOffset);
 }
-#line 1357 "parse.c"
-      break;
-    case 205:
-    case 208:
-    case 215:
-#line 472 "parse.y"
-{sqlite3IdListDelete((yypminor->yy272));}
 #line 1364 "parse.c"
       break;
-    case 230:
-    case 235:
-#line 896 "parse.y"
-{sqlite3DeleteTriggerStep((yypminor->yy455));}
-#line 1370 "parse.c"
+    case 207:
+    case 210:
+    case 217:
+#line 481 "parse.y"
+{sqlite3IdListDelete((yypminor->yy232));}
+#line 1371 "parse.c"
       break;
     case 232:
-#line 880 "parse.y"
-{sqlite3IdListDelete((yypminor->yy62).b);}
-#line 1375 "parse.c"
+    case 237:
+#line 905 "parse.y"
+{sqlite3DeleteTriggerStep((yypminor->yy451));}
+#line 1377 "parse.c"
       break;
+    case 234:
+#line 889 "parse.y"
+{sqlite3IdListDelete((yypminor->yy378).b);}
+#line 1382 "parse.c"
+      break;
     default:  break;   /* If no destructor action specified: do nothing */
   }
 }
@@ -1546,311 +1553,315 @@
   YYCODETYPE lhs;         /* Symbol on the left-hand side of the rule */
   unsigned char nrhs;     /* Number of right-hand side symbols in the rule */
 } yyRuleInfo[] = {
-  { 142, 1 },
-  { 143, 2 },
-  { 143, 1 },
-  { 145, 1 },
   { 144, 1 },
-  { 144, 3 },
-  { 147, 0 },
+  { 145, 2 },
+  { 145, 1 },
   { 147, 1 },
+  { 146, 1 },
   { 146, 3 },
   { 149, 0 },
   { 149, 1 },
-  { 149, 2 },
-  { 148, 0 },
-  { 148, 1 },
-  { 148, 1 },
-  { 148, 1 },
-  { 146, 2 },
-  { 146, 2 },
-  { 146, 2 },
-  { 146, 2 },
-  { 151, 5 },
-  { 153, 1 },
-  { 153, 0 },
-  { 152, 4 },
-  { 152, 2 },
-  { 155, 3 },
-  { 155, 1 },
-  { 158, 3 },
-  { 159, 1 },
-  { 162, 1 },
-  { 163, 1 },
-  { 163, 1 },
+  { 148, 3 },
+  { 151, 0 },
+  { 151, 1 },
+  { 151, 2 },
+  { 150, 0 },
   { 150, 1 },
   { 150, 1 },
   { 150, 1 },
-  { 160, 0 },
-  { 160, 1 },
-  { 160, 4 },
-  { 160, 6 },
+  { 148, 2 },
+  { 148, 2 },
+  { 148, 2 },
+  { 148, 2 },
+  { 153, 5 },
+  { 155, 1 },
+  { 155, 0 },
+  { 154, 4 },
+  { 154, 2 },
+  { 157, 3 },
+  { 157, 1 },
+  { 160, 3 },
+  { 161, 1 },
   { 164, 1 },
-  { 164, 2 },
   { 165, 1 },
   { 165, 1 },
-  { 161, 2 },
-  { 161, 0 },
-  { 168, 3 },
-  { 168, 1 },
-  { 168, 2 },
-  { 168, 3 },
-  { 168, 3 },
-  { 168, 2 },
-  { 169, 2 },
-  { 169, 3 },
-  { 169, 5 },
-  { 169, 2 },
-  { 169, 5 },
-  { 169, 4 },
-  { 169, 1 },
-  { 169, 2 },
-  { 173, 0 },
-  { 173, 1 },
-  { 176, 0 },
-  { 176, 2 },
+  { 152, 1 },
+  { 152, 1 },
+  { 152, 1 },
+  { 162, 0 },
+  { 162, 1 },
+  { 162, 4 },
+  { 162, 6 },
+  { 166, 1 },
+  { 166, 2 },
+  { 167, 1 },
+  { 167, 1 },
+  { 163, 2 },
+  { 163, 0 },
+  { 170, 3 },
+  { 170, 1 },
+  { 170, 2 },
+  { 170, 3 },
+  { 170, 3 },
+  { 170, 2 },
+  { 171, 2 },
+  { 171, 3 },
+  { 171, 5 },
+  { 171, 2 },
+  { 171, 5 },
+  { 171, 4 },
+  { 171, 1 },
+  { 171, 2 },
+  { 175, 0 },
+  { 175, 1 },
+  { 178, 0 },
   { 178, 2 },
-  { 178, 3 },
-  { 178, 3 },
-  { 178, 3 },
-  { 179, 2 },
-  { 179, 2 },
-  { 179, 1 },
-  { 179, 1 },
-  { 177, 3 },
-  { 177, 2 },
-  { 180, 0 },
   { 180, 2 },
-  { 180, 2 },
-  { 156, 0 },
-  { 156, 2 },
-  { 181, 3 },
+  { 180, 3 },
+  { 180, 3 },
+  { 180, 3 },
   { 181, 2 },
+  { 181, 2 },
   { 181, 1 },
+  { 181, 1 },
+  { 179, 3 },
+  { 179, 2 },
+  { 182, 0 },
   { 182, 2 },
-  { 182, 7 },
-  { 182, 5 },
-  { 182, 3 },
-  { 182, 10 },
-  { 184, 0 },
-  { 184, 1 },
-  { 171, 0 },
-  { 171, 3 },
-  { 185, 0 },
-  { 185, 2 },
+  { 182, 2 },
+  { 158, 0 },
+  { 158, 2 },
+  { 183, 3 },
+  { 183, 2 },
+  { 183, 1 },
+  { 184, 2 },
+  { 184, 7 },
+  { 184, 5 },
+  { 184, 3 },
+  { 184, 10 },
+  { 186, 0 },
   { 186, 1 },
-  { 186, 1 },
-  { 186, 1 },
-  { 146, 3 },
-  { 146, 7 },
-  { 146, 3 },
-  { 146, 1 },
-  { 157, 1 },
-  { 157, 3 },
-  { 190, 1 },
-  { 190, 2 },
-  { 190, 1 },
-  { 190, 1 },
-  { 189, 9 },
-  { 191, 1 },
-  { 191, 1 },
-  { 191, 0 },
-  { 199, 2 },
-  { 199, 0 },
-  { 192, 3 },
+  { 173, 0 },
+  { 173, 3 },
+  { 187, 0 },
+  { 187, 2 },
+  { 188, 1 },
+  { 188, 1 },
+  { 188, 1 },
+  { 148, 3 },
+  { 148, 7 },
+  { 148, 3 },
+  { 148, 1 },
+  { 159, 1 },
+  { 159, 3 },
+  { 192, 1 },
   { 192, 2 },
-  { 192, 4 },
-  { 200, 2 },
-  { 200, 1 },
-  { 200, 0 },
+  { 192, 1 },
+  { 192, 1 },
+  { 191, 9 },
+  { 193, 1 },
+  { 193, 1 },
   { 193, 0 },
-  { 193, 2 },
+  { 201, 2 },
+  { 201, 0 },
+  { 194, 3 },
+  { 194, 2 },
+  { 194, 4 },
   { 202, 2 },
+  { 202, 1 },
   { 202, 0 },
-  { 201, 6 },
-  { 201, 7 },
-  { 206, 1 },
-  { 206, 1 },
-  { 154, 0 },
-  { 154, 2 },
-  { 188, 2 },
-  { 203, 1 },
-  { 203, 1 },
-  { 203, 2 },
-  { 203, 3 },
-  { 203, 4 },
+  { 195, 0 },
+  { 195, 2 },
   { 204, 2 },
   { 204, 0 },
+  { 203, 6 },
+  { 203, 7 },
+  { 208, 1 },
+  { 208, 1 },
+  { 156, 0 },
+  { 156, 2 },
+  { 190, 2 },
+  { 205, 1 },
+  { 205, 1 },
+  { 205, 2 },
+  { 205, 3 },
   { 205, 4 },
-  { 205, 0 },
+  { 206, 2 },
+  { 206, 0 },
+  { 207, 4 },
+  { 207, 0 },
+  { 199, 0 },
+  { 199, 3 },
+  { 211, 5 },
+  { 211, 3 },
+  { 212, 1 },
+  { 174, 1 },
+  { 174, 1 },
+  { 174, 0 },
+  { 213, 0 },
+  { 213, 2 },
   { 197, 0 },
   { 197, 3 },
-  { 209, 5 },
-  { 209, 3 },
-  { 210, 1 },
-  { 172, 1 },
-  { 172, 1 },
-  { 172, 0 },
-  { 211, 0 },
-  { 211, 2 },
-  { 195, 0 },
-  { 195, 3 },
-  { 196, 0 },
-  { 196, 2 },
   { 198, 0 },
   { 198, 2 },
-  { 198, 4 },
-  { 198, 4 },
-  { 146, 4 },
-  { 194, 0 },
-  { 194, 2 },
-  { 146, 6 },
-  { 213, 5 },
-  { 213, 3 },
-  { 146, 8 },
-  { 146, 5 },
-  { 214, 2 },
-  { 214, 1 },
-  { 216, 3 },
+  { 200, 0 },
+  { 200, 2 },
+  { 200, 4 },
+  { 200, 4 },
+  { 148, 4 },
+  { 196, 0 },
+  { 196, 2 },
+  { 148, 6 },
+  { 215, 5 },
+  { 215, 3 },
+  { 148, 8 },
+  { 148, 5 },
+  { 216, 2 },
   { 216, 1 },
-  { 215, 0 },
-  { 215, 3 },
-  { 208, 3 },
-  { 208, 1 },
-  { 174, 1 },
-  { 174, 3 },
-  { 170, 1 },
-  { 174, 1 },
-  { 174, 1 },
-  { 174, 3 },
-  { 174, 5 },
-  { 170, 1 },
-  { 170, 1 },
-  { 170, 1 },
-  { 170, 1 },
-  { 174, 1 },
-  { 174, 1 },
-  { 174, 4 },
-  { 174, 4 },
-  { 170, 1 },
-  { 170, 1 },
-  { 170, 1 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 217, 1 },
-  { 217, 1 },
-  { 217, 2 },
-  { 217, 2 },
-  { 218, 2 },
-  { 218, 0 },
-  { 174, 4 },
-  { 174, 2 },
-  { 174, 3 },
-  { 174, 2 },
-  { 174, 3 },
-  { 174, 4 },
-  { 174, 2 },
-  { 174, 2 },
-  { 174, 2 },
-  { 174, 2 },
+  { 218, 3 },
+  { 218, 1 },
+  { 217, 0 },
+  { 217, 3 },
+  { 210, 3 },
+  { 210, 1 },
+  { 176, 1 },
+  { 176, 3 },
+  { 172, 1 },
+  { 176, 1 },
+  { 176, 1 },
+  { 176, 3 },
+  { 176, 5 },
+  { 172, 1 },
+  { 172, 1 },
+  { 172, 1 },
+  { 172, 1 },
+  { 176, 1 },
+  { 176, 1 },
+  { 176, 4 },
+  { 176, 4 },
+  { 172, 1 },
+  { 172, 1 },
+  { 172, 1 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
+  { 176, 3 },
   { 219, 1 },
+  { 219, 1 },
   { 219, 2 },
-  { 174, 5 },
-  { 220, 1 },
+  { 219, 2 },
   { 220, 2 },
-  { 174, 5 },
-  { 174, 3 },
-  { 174, 5 },
-  { 174, 4 },
-  { 174, 4 },
-  { 174, 5 },
-  { 222, 5 },
-  { 222, 4 },
-  { 223, 2 },
-  { 223, 0 },
+  { 220, 0 },
+  { 176, 4 },
+  { 176, 2 },
+  { 176, 3 },
+  { 176, 2 },
+  { 176, 3 },
+  { 176, 4 },
+  { 176, 2 },
+  { 176, 2 },
+  { 176, 2 },
+  { 176, 2 },
   { 221, 1 },
-  { 221, 0 },
-  { 212, 3 },
-  { 212, 1 },
-  { 224, 1 },
-  { 224, 0 },
-  { 146, 11 },
-  { 225, 1 },
+  { 221, 2 },
+  { 176, 5 },
+  { 222, 1 },
+  { 222, 2 },
+  { 176, 5 },
+  { 176, 3 },
+  { 176, 5 },
+  { 176, 4 },
+  { 176, 4 },
+  { 176, 5 },
+  { 224, 5 },
+  { 224, 4 },
+  { 225, 2 },
   { 225, 0 },
-  { 175, 0 },
-  { 175, 3 },
-  { 183, 5 },
-  { 183, 3 },
+  { 223, 1 },
+  { 223, 0 },
+  { 214, 3 },
+  { 214, 1 },
   { 226, 1 },
-  { 146, 3 },
-  { 146, 1 },
-  { 146, 2 },
-  { 146, 5 },
-  { 146, 5 },
-  { 146, 5 },
-  { 146, 5 },
-  { 146, 6 },
-  { 146, 3 },
-  { 166, 2 },
-  { 167, 2 },
-  { 228, 1 },
-  { 228, 1 },
+  { 226, 0 },
+  { 148, 11 },
   { 227, 1 },
   { 227, 0 },
-  { 146, 5 },
-  { 229, 10 },
-  { 231, 1 },
-  { 231, 1 },
-  { 231, 2 },
-  { 231, 0 },
-  { 232, 1 },
-  { 232, 1 },
-  { 232, 1 },
-  { 232, 3 },
+  { 177, 0 },
+  { 177, 3 },
+  { 185, 5 },
+  { 185, 3 },
+  { 228, 1 },
+  { 148, 3 },
+  { 148, 1 },
+  { 148, 2 },
+  { 148, 5 },
+  { 148, 5 },
+  { 148, 5 },
+  { 148, 5 },
+  { 148, 6 },
+  { 148, 3 },
+  { 168, 2 },
+  { 169, 2 },
+  { 230, 1 },
+  { 230, 1 },
+  { 229, 1 },
+  { 229, 0 },
+  { 148, 5 },
+  { 231, 10 },
+  { 233, 1 },
+  { 233, 1 },
+  { 233, 2 },
   { 233, 0 },
-  { 233, 3 },
-  { 233, 3 },
-  { 234, 0 },
-  { 234, 2 },
-  { 230, 3 },
-  { 230, 0 },
-  { 235, 6 },
-  { 235, 8 },
-  { 235, 5 },
-  { 235, 4 },
-  { 235, 1 },
-  { 174, 4 },
-  { 174, 6 },
-  { 187, 1 },
-  { 187, 1 },
-  { 187, 1 },
-  { 146, 3 },
-  { 146, 6 },
-  { 237, 0 },
-  { 237, 2 },
-  { 237, 2 },
-  { 236, 1 },
+  { 234, 1 },
+  { 234, 1 },
+  { 234, 1 },
+  { 234, 3 },
+  { 235, 0 },
+  { 235, 3 },
+  { 235, 3 },
   { 236, 0 },
-  { 146, 3 },
-  { 146, 1 },
-  { 146, 3 },
-  { 146, 6 },
+  { 236, 2 },
+  { 232, 3 },
+  { 232, 0 },
+  { 237, 6 },
+  { 237, 8 },
+  { 237, 5 },
+  { 237, 4 },
+  { 237, 1 },
+  { 176, 4 },
+  { 176, 6 },
+  { 189, 1 },
+  { 189, 1 },
+  { 189, 1 },
+  { 148, 3 },
+  { 148, 6 },
+  { 239, 0 },
+  { 239, 2 },
+  { 239, 2 },
+  { 238, 1 },
+  { 238, 0 },
+  { 148, 3 },
+  { 148, 1 },
+  { 148, 3 },
+  { 148, 6 },
+  { 148, 6 },
+  { 240, 1 },
+  { 241, 0 },
+  { 241, 1 },
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -1902,27 +1913,27 @@
       case 3:
 #line 84 "parse.y"
 { sqlite3FinishCoding(pParse); }
-#line 1907 "parse.c"
+#line 1918 "parse.c"
         break;
       case 6:
 #line 87 "parse.y"
 { sqlite3BeginParse(pParse, 0); }
-#line 1912 "parse.c"
+#line 1923 "parse.c"
         break;
       case 7:
 #line 89 "parse.y"
 { sqlite3BeginParse(pParse, 1); }
-#line 1917 "parse.c"
+#line 1928 "parse.c"
         break;
       case 8:
 #line 95 "parse.y"
-{sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy60);}
-#line 1922 "parse.c"
+{sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy328);}
+#line 1933 "parse.c"
         break;
       case 12:
 #line 100 "parse.y"
-{yygotominor.yy60 = TK_DEFERRED;}
-#line 1927 "parse.c"
+{yygotominor.yy328 = TK_DEFERRED;}
+#line 1938 "parse.c"
         break;
       case 13:
       case 14:
@@ -1931,26 +1942,26 @@
       case 103:
       case 104:
 #line 101 "parse.y"
-{yygotominor.yy60 = yymsp[0].major;}
-#line 1937 "parse.c"
+{yygotominor.yy328 = yymsp[0].major;}
+#line 1948 "parse.c"
         break;
       case 16:
       case 17:
 #line 104 "parse.y"
 {sqlite3CommitTransaction(pParse);}
-#line 1943 "parse.c"
+#line 1954 "parse.c"
         break;
       case 18:
 #line 106 "parse.y"
 {sqlite3RollbackTransaction(pParse);}
-#line 1948 "parse.c"
+#line 1959 "parse.c"
         break;
       case 20:
 #line 111 "parse.y"
 {
-   sqlite3StartTable(pParse,&yymsp[-4].minor.yy0,&yymsp[-1].minor.yy406,&yymsp[0].minor.yy406,yymsp[-3].minor.yy60,0);
+   sqlite3StartTable(pParse,&yymsp[-4].minor.yy0,&yymsp[-1].minor.yy430,&yymsp[0].minor.yy430,yymsp[-3].minor.yy328,0);
 }
-#line 1955 "parse.c"
+#line 1966 "parse.c"
         break;
       case 21:
       case 60:
@@ -1958,9 +1969,9 @@
       case 106:
       case 224:
       case 227:
-#line 115 "parse.y"
-{yygotominor.yy60 = 1;}
-#line 1965 "parse.c"
+#line 116 "parse.y"
+{yygotominor.yy328 = 1;}
+#line 1976 "parse.c"
         break;
       case 22:
       case 59:
@@ -1971,29 +1982,40 @@
       case 108:
       case 223:
       case 226:
-#line 116 "parse.y"
-{yygotominor.yy60 = 0;}
-#line 1978 "parse.c"
+#line 118 "parse.y"
+{yygotominor.yy328 = 0;}
+#line 1989 "parse.c"
         break;
       case 23:
-#line 117 "parse.y"
+#line 119 "parse.y"
 {
-  sqlite3EndTable(pParse,&yymsp[0].minor.yy0,0);
+  sqlite3EndTable(pParse,&yymsp[-1].minor.yy430,&yymsp[0].minor.yy0,0);
 }
-#line 1985 "parse.c"
+#line 1996 "parse.c"
         break;
       case 24:
-#line 120 "parse.y"
+#line 122 "parse.y"
 {
-  sqlite3EndTable(pParse,0,yymsp[0].minor.yy331);
-  sqlite3SelectDelete(yymsp[0].minor.yy331);
+  sqlite3EndTable(pParse,0,0,yymsp[0].minor.yy91);
+  sqlite3SelectDelete(yymsp[0].minor.yy91);
 }
-#line 1993 "parse.c"
+#line 2004 "parse.c"
         break;
+      case 27:
+#line 133 "parse.y"
+{
+  yygotominor.yy430.z = yymsp[-2].minor.yy430.z;
+  yygotominor.yy430.n = (pParse->sLastToken.z-yymsp[-2].minor.yy430.z) + pParse->sLastToken.n;
+}
+#line 2012 "parse.c"
+        break;
       case 28:
-#line 132 "parse.y"
-{sqlite3AddColumn(pParse,&yymsp[0].minor.yy406);}
-#line 1998 "parse.c"
+#line 137 "parse.y"
+{
+  sqlite3AddColumn(pParse,&yymsp[0].minor.yy430);
+  yygotominor.yy430 = yymsp[0].minor.yy430;
+}
+#line 2020 "parse.c"
         break;
       case 29:
       case 30:
@@ -2003,24 +2025,24 @@
       case 34:
       case 263:
       case 264:
-#line 138 "parse.y"
-{yygotominor.yy406 = yymsp[0].minor.yy0;}
-#line 2010 "parse.c"
+#line 147 "parse.y"
+{yygotominor.yy430 = yymsp[0].minor.yy0;}
+#line 2032 "parse.c"
         break;
       case 36:
-#line 193 "parse.y"
-{sqlite3AddColumnType(pParse,&yymsp[0].minor.yy406,&yymsp[0].minor.yy406);}
-#line 2015 "parse.c"
+#line 202 "parse.y"
+{sqlite3AddColumnType(pParse,&yymsp[0].minor.yy430,&yymsp[0].minor.yy430);}
+#line 2037 "parse.c"
         break;
       case 37:
-#line 194 "parse.y"
-{sqlite3AddColumnType(pParse,&yymsp[-3].minor.yy406,&yymsp[0].minor.yy0);}
-#line 2020 "parse.c"
+#line 203 "parse.y"
+{sqlite3AddColumnType(pParse,&yymsp[-3].minor.yy430,&yymsp[0].minor.yy0);}
+#line 2042 "parse.c"
         break;
       case 38:
-#line 196 "parse.y"
-{sqlite3AddColumnType(pParse,&yymsp[-5].minor.yy406,&yymsp[0].minor.yy0);}
-#line 2025 "parse.c"
+#line 205 "parse.y"
+{sqlite3AddColumnType(pParse,&yymsp[-5].minor.yy430,&yymsp[0].minor.yy0);}
+#line 2047 "parse.c"
         break;
       case 39:
       case 114:
@@ -2030,126 +2052,131 @@
       case 251:
       case 261:
       case 262:
-#line 198 "parse.y"
-{yygotominor.yy406 = yymsp[0].minor.yy406;}
-#line 2037 "parse.c"
+#line 207 "parse.y"
+{yygotominor.yy430 = yymsp[0].minor.yy430;}
+#line 2059 "parse.c"
         break;
       case 40:
-#line 199 "parse.y"
-{yygotominor.yy406.z=yymsp[-1].minor.yy406.z; yygotominor.yy406.n=yymsp[0].minor.yy406.n+(yymsp[0].minor.yy406.z-yymsp[-1].minor.yy406.z);}
-#line 2042 "parse.c"
+#line 208 "parse.y"
+{yygotominor.yy430.z=yymsp[-1].minor.yy430.z; yygotominor.yy430.n=yymsp[0].minor.yy430.n+(yymsp[0].minor.yy430.z-yymsp[-1].minor.yy430.z);}
+#line 2064 "parse.c"
         break;
       case 41:
-#line 201 "parse.y"
-{ yygotominor.yy60 = atoi(yymsp[0].minor.yy406.z); }
-#line 2047 "parse.c"
+#line 210 "parse.y"
+{ yygotominor.yy328 = atoi(yymsp[0].minor.yy430.z); }
+#line 2069 "parse.c"
         break;
       case 42:
-#line 202 "parse.y"
-{ yygotominor.yy60 = -atoi(yymsp[0].minor.yy406.z); }
-#line 2052 "parse.c"
+#line 211 "parse.y"
+{ yygotominor.yy328 = -atoi(yymsp[0].minor.yy430.z); }
+#line 2074 "parse.c"
         break;
       case 47:
       case 48:
-#line 207 "parse.y"
-{sqlite3AddDefaultValue(pParse,yymsp[0].minor.yy454);}
-#line 2058 "parse.c"
+#line 216 "parse.y"
+{sqlite3AddDefaultValue(pParse,yymsp[0].minor.yy418);}
+#line 2080 "parse.c"
         break;
       case 49:
-#line 209 "parse.y"
+#line 218 "parse.y"
 {
-  Expr *p = sqlite3Expr(TK_UMINUS, yymsp[0].minor.yy454, 0, 0);
+  Expr *p = sqlite3Expr(TK_UMINUS, yymsp[0].minor.yy418, 0, 0);
   sqlite3AddDefaultValue(pParse,p);
 }
-#line 2066 "parse.c"
+#line 2088 "parse.c"
         break;
       case 50:
-#line 213 "parse.y"
+#line 222 "parse.y"
 {
-  Expr *p = sqlite3Expr(TK_STRING, 0, 0, &yymsp[0].minor.yy406);
+  Expr *p = sqlite3Expr(TK_STRING, 0, 0, &yymsp[0].minor.yy430);
   sqlite3AddDefaultValue(pParse,p);
 }
-#line 2074 "parse.c"
+#line 2096 "parse.c"
         break;
       case 52:
-#line 222 "parse.y"
-{sqlite3AddNotNull(pParse, yymsp[0].minor.yy60);}
-#line 2079 "parse.c"
+#line 231 "parse.y"
+{sqlite3AddNotNull(pParse, yymsp[0].minor.yy328);}
+#line 2101 "parse.c"
         break;
       case 53:
-#line 224 "parse.y"
-{sqlite3AddPrimaryKey(pParse,0,yymsp[-1].minor.yy60,yymsp[0].minor.yy60);}
-#line 2084 "parse.c"
+#line 233 "parse.y"
+{sqlite3AddPrimaryKey(pParse,0,yymsp[-1].minor.yy328,yymsp[0].minor.yy328);}
+#line 2106 "parse.c"
         break;
       case 54:
-#line 225 "parse.y"
-{sqlite3CreateIndex(pParse,0,0,0,0,yymsp[0].minor.yy60,0,0);}
-#line 2089 "parse.c"
+#line 234 "parse.y"
+{sqlite3CreateIndex(pParse,0,0,0,0,yymsp[0].minor.yy328,0,0);}
+#line 2111 "parse.c"
         break;
+      case 55:
+#line 235 "parse.y"
+{sqlite3ExprDelete(yymsp[-2].minor.yy418);}
+#line 2116 "parse.c"
+        break;
       case 56:
-#line 228 "parse.y"
-{sqlite3CreateForeignKey(pParse,0,&yymsp[-2].minor.yy406,yymsp[-1].minor.yy266,yymsp[0].minor.yy60);}
-#line 2094 "parse.c"
+#line 237 "parse.y"
+{sqlite3CreateForeignKey(pParse,0,&yymsp[-2].minor.yy430,yymsp[-1].minor.yy322,yymsp[0].minor.yy328);}
+#line 2121 "parse.c"
         break;
       case 57:
-#line 229 "parse.y"
-{sqlite3DeferForeignKey(pParse,yymsp[0].minor.yy60);}
-#line 2099 "parse.c"
+#line 238 "parse.y"
+{sqlite3DeferForeignKey(pParse,yymsp[0].minor.yy328);}
+#line 2126 "parse.c"
         break;
       case 58:
-#line 230 "parse.y"
-{sqlite3AddCollateType(pParse, yymsp[0].minor.yy406.z, yymsp[0].minor.yy406.n);}
-#line 2104 "parse.c"
+#line 239 "parse.y"
+{sqlite3AddCollateType(pParse, yymsp[0].minor.yy430.z, yymsp[0].minor.yy430.n);}
+#line 2131 "parse.c"
         break;
       case 61:
-#line 243 "parse.y"
-{ yygotominor.yy60 = OE_Restrict * 0x010101; }
-#line 2109 "parse.c"
+#line 252 "parse.y"
+{ yygotominor.yy328 = OE_Restrict * 0x010101; }
+#line 2136 "parse.c"
         break;
       case 62:
-#line 244 "parse.y"
-{ yygotominor.yy60 = (yymsp[-1].minor.yy60 & yymsp[0].minor.yy243.mask) | yymsp[0].minor.yy243.value; }
-#line 2114 "parse.c"
+#line 253 "parse.y"
+{ yygotominor.yy328 = (yymsp[-1].minor.yy328 & yymsp[0].minor.yy319.mask) | yymsp[0].minor.yy319.value; }
+#line 2141 "parse.c"
         break;
       case 63:
-#line 246 "parse.y"
-{ yygotominor.yy243.value = 0;     yygotominor.yy243.mask = 0x000000; }
-#line 2119 "parse.c"
+#line 255 "parse.y"
+{ yygotominor.yy319.value = 0;     yygotominor.yy319.mask = 0x000000; }
+#line 2146 "parse.c"
         break;
       case 64:
-#line 247 "parse.y"
-{ yygotominor.yy243.value = yymsp[0].minor.yy60;     yygotominor.yy243.mask = 0x0000ff; }
-#line 2124 "parse.c"
+#line 256 "parse.y"
+{ yygotominor.yy319.value = yymsp[0].minor.yy328;     yygotominor.yy319.mask = 0x0000ff; }
+#line 2151 "parse.c"
         break;
       case 65:
-#line 248 "parse.y"
-{ yygotominor.yy243.value = yymsp[0].minor.yy60<<8;  yygotominor.yy243.mask = 0x00ff00; }
-#line 2129 "parse.c"
+#line 257 "parse.y"
+{ yygotominor.yy319.value = yymsp[0].minor.yy328<<8;  yygotominor.yy319.mask = 0x00ff00; }
+#line 2156 "parse.c"
         break;
       case 66:
-#line 249 "parse.y"
-{ yygotominor.yy243.value = yymsp[0].minor.yy60<<16; yygotominor.yy243.mask = 0xff0000; }
-#line 2134 "parse.c"
+#line 258 "parse.y"
+{ yygotominor.yy319.value = yymsp[0].minor.yy328<<16; yygotominor.yy319.mask = 0xff0000; }
+#line 2161 "parse.c"
         break;
       case 67:
-#line 251 "parse.y"
-{ yygotominor.yy60 = OE_SetNull; }
-#line 2139 "parse.c"
+#line 260 "parse.y"
+{ yygotominor.yy328 = OE_SetNull; }
+#line 2166 "parse.c"
         break;
       case 68:
-#line 252 "parse.y"
-{ yygotominor.yy60 = OE_SetDflt; }
-#line 2144 "parse.c"
+#line 261 "parse.y"
+{ yygotominor.yy328 = OE_SetDflt; }
+#line 2171 "parse.c"
         break;
       case 69:
-#line 253 "parse.y"
-{ yygotominor.yy60 = OE_Cascade; }
-#line 2149 "parse.c"
+#line 262 "parse.y"
+{ yygotominor.yy328 = OE_Cascade; }
+#line 2176 "parse.c"
         break;
       case 70:
-#line 254 "parse.y"
-{ yygotominor.yy60 = OE_Restrict; }
-#line 2154 "parse.c"
+#line 263 "parse.y"
+{ yygotominor.yy328 = OE_Restrict; }
+#line 2181 "parse.c"
         break;
       case 71:
       case 72:
@@ -2158,238 +2185,248 @@
       case 91:
       case 92:
       case 163:
-#line 256 "parse.y"
-{yygotominor.yy60 = yymsp[0].minor.yy60;}
-#line 2165 "parse.c"
+#line 265 "parse.y"
+{yygotominor.yy328 = yymsp[0].minor.yy328;}
+#line 2192 "parse.c"
         break;
+      case 76:
+#line 275 "parse.y"
+{yygotominor.yy430.n = 0; yygotominor.yy430.z = 0;}
+#line 2197 "parse.c"
+        break;
+      case 77:
+#line 276 "parse.y"
+{yygotominor.yy430 = yymsp[-1].minor.yy0;}
+#line 2202 "parse.c"
+        break;
       case 82:
-#line 273 "parse.y"
-{sqlite3AddPrimaryKey(pParse,yymsp[-3].minor.yy266,yymsp[0].minor.yy60,yymsp[-2].minor.yy60);}
-#line 2170 "parse.c"
+#line 282 "parse.y"
+{sqlite3AddPrimaryKey(pParse,yymsp[-3].minor.yy322,yymsp[0].minor.yy328,yymsp[-2].minor.yy328);}
+#line 2207 "parse.c"
         break;
       case 83:
-#line 275 "parse.y"
-{sqlite3CreateIndex(pParse,0,0,0,yymsp[-2].minor.yy266,yymsp[0].minor.yy60,0,0);}
-#line 2175 "parse.c"
+#line 284 "parse.y"
+{sqlite3CreateIndex(pParse,0,0,0,yymsp[-2].minor.yy322,yymsp[0].minor.yy328,0,0);}
+#line 2212 "parse.c"
         break;
       case 85:
-#line 278 "parse.y"
+#line 287 "parse.y"
 {
-    sqlite3CreateForeignKey(pParse, yymsp[-6].minor.yy266, &yymsp[-3].minor.yy406, yymsp[-2].minor.yy266, yymsp[-1].minor.yy60);
-    sqlite3DeferForeignKey(pParse, yymsp[0].minor.yy60);
+    sqlite3CreateForeignKey(pParse, yymsp[-6].minor.yy322, &yymsp[-3].minor.yy430, yymsp[-2].minor.yy322, yymsp[-1].minor.yy328);
+    sqlite3DeferForeignKey(pParse, yymsp[0].minor.yy328);
 }
-#line 2183 "parse.c"
+#line 2220 "parse.c"
         break;
       case 88:
       case 90:
-#line 292 "parse.y"
-{yygotominor.yy60 = OE_Default;}
-#line 2189 "parse.c"
+#line 301 "parse.y"
+{yygotominor.yy328 = OE_Default;}
+#line 2226 "parse.c"
         break;
       case 93:
-#line 297 "parse.y"
-{yygotominor.yy60 = OE_Ignore;}
-#line 2194 "parse.c"
+#line 306 "parse.y"
+{yygotominor.yy328 = OE_Ignore;}
+#line 2231 "parse.c"
         break;
       case 94:
       case 164:
-#line 298 "parse.y"
-{yygotominor.yy60 = OE_Replace;}
-#line 2200 "parse.c"
+#line 307 "parse.y"
+{yygotominor.yy328 = OE_Replace;}
+#line 2237 "parse.c"
         break;
       case 95:
-#line 302 "parse.y"
+#line 311 "parse.y"
 {
-  sqlite3DropTable(pParse, yymsp[0].minor.yy427, 0);
+  sqlite3DropTable(pParse, yymsp[0].minor.yy439, 0);
 }
-#line 2207 "parse.c"
+#line 2244 "parse.c"
         break;
       case 96:
-#line 309 "parse.y"
+#line 318 "parse.y"
 {
-  sqlite3CreateView(pParse, &yymsp[-6].minor.yy0, &yymsp[-3].minor.yy406, &yymsp[-2].minor.yy406, yymsp[0].minor.yy331, yymsp[-5].minor.yy60);
+  sqlite3CreateView(pParse, &yymsp[-6].minor.yy0, &yymsp[-3].minor.yy430, &yymsp[-2].minor.yy430, yymsp[0].minor.yy91, yymsp[-5].minor.yy328);
 }
-#line 2214 "parse.c"
+#line 2251 "parse.c"
         break;
       case 97:
-#line 312 "parse.y"
+#line 321 "parse.y"
 {
-  sqlite3DropTable(pParse, yymsp[0].minor.yy427, 1);
+  sqlite3DropTable(pParse, yymsp[0].minor.yy439, 1);
 }
-#line 2221 "parse.c"
+#line 2258 "parse.c"
         break;
       case 98:
-#line 319 "parse.y"
+#line 328 "parse.y"
 {
-  sqlite3Select(pParse, yymsp[0].minor.yy331, SRT_Callback, 0, 0, 0, 0, 0);
-  sqlite3SelectDelete(yymsp[0].minor.yy331);
+  sqlite3Select(pParse, yymsp[0].minor.yy91, SRT_Callback, 0, 0, 0, 0, 0);
+  sqlite3SelectDelete(yymsp[0].minor.yy91);
 }
-#line 2229 "parse.c"
+#line 2266 "parse.c"
         break;
       case 99:
       case 123:
-#line 329 "parse.y"
-{yygotominor.yy331 = yymsp[0].minor.yy331;}
-#line 2235 "parse.c"
+#line 338 "parse.y"
+{yygotominor.yy91 = yymsp[0].minor.yy91;}
+#line 2272 "parse.c"
         break;
       case 100:
-#line 331 "parse.y"
+#line 340 "parse.y"
 {
-  if( yymsp[0].minor.yy331 ){
-    yymsp[0].minor.yy331->op = yymsp[-1].minor.yy60;
-    yymsp[0].minor.yy331->pPrior = yymsp[-2].minor.yy331;
+  if( yymsp[0].minor.yy91 ){
+    yymsp[0].minor.yy91->op = yymsp[-1].minor.yy328;
+    yymsp[0].minor.yy91->pPrior = yymsp[-2].minor.yy91;
   }
-  yygotominor.yy331 = yymsp[0].minor.yy331;
+  yygotominor.yy91 = yymsp[0].minor.yy91;
 }
-#line 2246 "parse.c"
+#line 2283 "parse.c"
         break;
       case 102:
-#line 340 "parse.y"
-{yygotominor.yy60 = TK_ALL;}
-#line 2251 "parse.c"
+#line 349 "parse.y"
+{yygotominor.yy328 = TK_ALL;}
+#line 2288 "parse.c"
         break;
       case 105:
-#line 345 "parse.y"
+#line 354 "parse.y"
 {
-  yygotominor.yy331 = sqlite3SelectNew(yymsp[-6].minor.yy266,yymsp[-5].minor.yy427,yymsp[-4].minor.yy454,yymsp[-3].minor.yy266,yymsp[-2].minor.yy454,yymsp[-1].minor.yy266,yymsp[-7].minor.yy60,yymsp[0].minor.yy348.pLimit,yymsp[0].minor.yy348.pOffset);
+  yygotominor.yy91 = sqlite3SelectNew(yymsp[-6].minor.yy322,yymsp[-5].minor.yy439,yymsp[-4].minor.yy418,yymsp[-3].minor.yy322,yymsp[-2].minor.yy418,yymsp[-1].minor.yy322,yymsp[-7].minor.yy328,yymsp[0].minor.yy388.pLimit,yymsp[0].minor.yy388.pOffset);
 }
-#line 2258 "parse.c"
+#line 2295 "parse.c"
         break;
       case 109:
       case 248:
-#line 366 "parse.y"
-{yygotominor.yy266 = yymsp[-1].minor.yy266;}
-#line 2264 "parse.c"
+#line 375 "parse.y"
+{yygotominor.yy322 = yymsp[-1].minor.yy322;}
+#line 2301 "parse.c"
         break;
       case 110:
       case 137:
       case 147:
       case 247:
-#line 367 "parse.y"
-{yygotominor.yy266 = 0;}
-#line 2272 "parse.c"
+#line 376 "parse.y"
+{yygotominor.yy322 = 0;}
+#line 2309 "parse.c"
         break;
       case 111:
-#line 368 "parse.y"
+#line 377 "parse.y"
 {
-   yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-2].minor.yy266,yymsp[-1].minor.yy454,yymsp[0].minor.yy406.n?&yymsp[0].minor.yy406:0);
+   yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-2].minor.yy322,yymsp[-1].minor.yy418,yymsp[0].minor.yy430.n?&yymsp[0].minor.yy430:0);
 }
-#line 2279 "parse.c"
+#line 2316 "parse.c"
         break;
       case 112:
-#line 371 "parse.y"
+#line 380 "parse.y"
 {
-  yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-1].minor.yy266, sqlite3Expr(TK_ALL, 0, 0, 0), 0);
+  yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-1].minor.yy322, sqlite3Expr(TK_ALL, 0, 0, 0), 0);
 }
-#line 2286 "parse.c"
+#line 2323 "parse.c"
         break;
       case 113:
-#line 374 "parse.y"
+#line 383 "parse.y"
 {
   Expr *pRight = sqlite3Expr(TK_ALL, 0, 0, 0);
-  Expr *pLeft = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy406);
-  yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-3].minor.yy266, sqlite3Expr(TK_DOT, pLeft, pRight, 0), 0);
+  Expr *pLeft = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy430);
+  yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-3].minor.yy322, sqlite3Expr(TK_DOT, pLeft, pRight, 0), 0);
 }
-#line 2295 "parse.c"
+#line 2332 "parse.c"
         break;
       case 116:
-#line 386 "parse.y"
-{yygotominor.yy406.n = 0;}
-#line 2300 "parse.c"
+#line 395 "parse.y"
+{yygotominor.yy430.n = 0;}
+#line 2337 "parse.c"
         break;
       case 117:
-#line 398 "parse.y"
-{yygotominor.yy427 = sqliteMalloc(sizeof(*yygotominor.yy427));}
-#line 2305 "parse.c"
+#line 407 "parse.y"
+{yygotominor.yy439 = sqliteMalloc(sizeof(*yygotominor.yy439));}
+#line 2342 "parse.c"
         break;
       case 118:
-#line 399 "parse.y"
-{yygotominor.yy427 = yymsp[0].minor.yy427;}
-#line 2310 "parse.c"
+#line 408 "parse.y"
+{yygotominor.yy439 = yymsp[0].minor.yy439;}
+#line 2347 "parse.c"
         break;
       case 119:
-#line 404 "parse.y"
+#line 413 "parse.y"
 {
-   yygotominor.yy427 = yymsp[-1].minor.yy427;
-   if( yygotominor.yy427 && yygotominor.yy427->nSrc>0 ) yygotominor.yy427->a[yygotominor.yy427->nSrc-1].jointype = yymsp[0].minor.yy60;
+   yygotominor.yy439 = yymsp[-1].minor.yy439;
+   if( yygotominor.yy439 && yygotominor.yy439->nSrc>0 ) yygotominor.yy439->a[yygotominor.yy439->nSrc-1].jointype = yymsp[0].minor.yy328;
 }
-#line 2318 "parse.c"
+#line 2355 "parse.c"
         break;
       case 120:
-#line 408 "parse.y"
-{yygotominor.yy427 = 0;}
-#line 2323 "parse.c"
+#line 417 "parse.y"
+{yygotominor.yy439 = 0;}
+#line 2360 "parse.c"
         break;
       case 121:
-#line 409 "parse.y"
+#line 418 "parse.y"
 {
-  yygotominor.yy427 = sqlite3SrcListAppend(yymsp[-5].minor.yy427,&yymsp[-4].minor.yy406,&yymsp[-3].minor.yy406);
-  if( yymsp[-2].minor.yy406.n ) sqlite3SrcListAddAlias(yygotominor.yy427,&yymsp[-2].minor.yy406);
-  if( yymsp[-1].minor.yy454 ){
-    if( yygotominor.yy427 && yygotominor.yy427->nSrc>1 ){ yygotominor.yy427->a[yygotominor.yy427->nSrc-2].pOn = yymsp[-1].minor.yy454; }
-    else { sqlite3ExprDelete(yymsp[-1].minor.yy454); }
+  yygotominor.yy439 = sqlite3SrcListAppend(yymsp[-5].minor.yy439,&yymsp[-4].minor.yy430,&yymsp[-3].minor.yy430);
+  if( yymsp[-2].minor.yy430.n ) sqlite3SrcListAddAlias(yygotominor.yy439,&yymsp[-2].minor.yy430);
+  if( yymsp[-1].minor.yy418 ){
+    if( yygotominor.yy439 && yygotominor.yy439->nSrc>1 ){ yygotominor.yy439->a[yygotominor.yy439->nSrc-2].pOn = yymsp[-1].minor.yy418; }
+    else { sqlite3ExprDelete(yymsp[-1].minor.yy418); }
   }
-  if( yymsp[0].minor.yy272 ){
-    if( yygotominor.yy427 && yygotominor.yy427->nSrc>1 ){ yygotominor.yy427->a[yygotominor.yy427->nSrc-2].pUsing = yymsp[0].minor.yy272; }
-    else { sqlite3IdListDelete(yymsp[0].minor.yy272); }
+  if( yymsp[0].minor.yy232 ){
+    if( yygotominor.yy439 && yygotominor.yy439->nSrc>1 ){ yygotominor.yy439->a[yygotominor.yy439->nSrc-2].pUsing = yymsp[0].minor.yy232; }
+    else { sqlite3IdListDelete(yymsp[0].minor.yy232); }
   }
 }
-#line 2339 "parse.c"
+#line 2376 "parse.c"
         break;
       case 122:
-#line 423 "parse.y"
+#line 432 "parse.y"
 {
-    yygotominor.yy427 = sqlite3SrcListAppend(yymsp[-6].minor.yy427,0,0);
-    yygotominor.yy427->a[yygotominor.yy427->nSrc-1].pSelect = yymsp[-4].minor.yy331;
-    if( yymsp[-2].minor.yy406.n ) sqlite3SrcListAddAlias(yygotominor.yy427,&yymsp[-2].minor.yy406);
-    if( yymsp[-1].minor.yy454 ){
-      if( yygotominor.yy427 && yygotominor.yy427->nSrc>1 ){ yygotominor.yy427->a[yygotominor.yy427->nSrc-2].pOn = yymsp[-1].minor.yy454; }
-      else { sqlite3ExprDelete(yymsp[-1].minor.yy454); }
+    yygotominor.yy439 = sqlite3SrcListAppend(yymsp[-6].minor.yy439,0,0);
+    yygotominor.yy439->a[yygotominor.yy439->nSrc-1].pSelect = yymsp[-4].minor.yy91;
+    if( yymsp[-2].minor.yy430.n ) sqlite3SrcListAddAlias(yygotominor.yy439,&yymsp[-2].minor.yy430);
+    if( yymsp[-1].minor.yy418 ){
+      if( yygotominor.yy439 && yygotominor.yy439->nSrc>1 ){ yygotominor.yy439->a[yygotominor.yy439->nSrc-2].pOn = yymsp[-1].minor.yy418; }
+      else { sqlite3ExprDelete(yymsp[-1].minor.yy418); }
     }
-    if( yymsp[0].minor.yy272 ){
-      if( yygotominor.yy427 && yygotominor.yy427->nSrc>1 ){ yygotominor.yy427->a[yygotominor.yy427->nSrc-2].pUsing = yymsp[0].minor.yy272; }
-      else { sqlite3IdListDelete(yymsp[0].minor.yy272); }
+    if( yymsp[0].minor.yy232 ){
+      if( yygotominor.yy439 && yygotominor.yy439->nSrc>1 ){ yygotominor.yy439->a[yygotominor.yy439->nSrc-2].pUsing = yymsp[0].minor.yy232; }
+      else { sqlite3IdListDelete(yymsp[0].minor.yy232); }
     }
   }
-#line 2356 "parse.c"
+#line 2393 "parse.c"
         break;
       case 124:
-#line 444 "parse.y"
+#line 453 "parse.y"
 {
-     yygotominor.yy331 = sqlite3SelectNew(0,yymsp[0].minor.yy427,0,0,0,0,0,0,0);
+     yygotominor.yy91 = sqlite3SelectNew(0,yymsp[0].minor.yy439,0,0,0,0,0,0,0);
   }
-#line 2363 "parse.c"
+#line 2400 "parse.c"
         break;
       case 125:
-#line 450 "parse.y"
-{yygotominor.yy406.z=0; yygotominor.yy406.n=0;}
-#line 2368 "parse.c"
+#line 459 "parse.y"
+{yygotominor.yy430.z=0; yygotominor.yy430.n=0;}
+#line 2405 "parse.c"
         break;
       case 127:
-#line 455 "parse.y"
-{yygotominor.yy427 = sqlite3SrcListAppend(0,&yymsp[-1].minor.yy406,&yymsp[0].minor.yy406);}
-#line 2373 "parse.c"
+#line 464 "parse.y"
+{yygotominor.yy439 = sqlite3SrcListAppend(0,&yymsp[-1].minor.yy430,&yymsp[0].minor.yy430);}
+#line 2410 "parse.c"
         break;
       case 128:
       case 129:
-#line 459 "parse.y"
-{ yygotominor.yy60 = JT_INNER; }
-#line 2379 "parse.c"
+#line 468 "parse.y"
+{ yygotominor.yy328 = JT_INNER; }
+#line 2416 "parse.c"
         break;
       case 130:
-#line 461 "parse.y"
-{ yygotominor.yy60 = sqlite3JoinType(pParse,&yymsp[-1].minor.yy0,0,0); }
-#line 2384 "parse.c"
+#line 470 "parse.y"
+{ yygotominor.yy328 = sqlite3JoinType(pParse,&yymsp[-1].minor.yy0,0,0); }
+#line 2421 "parse.c"
         break;
       case 131:
-#line 462 "parse.y"
-{ yygotominor.yy60 = sqlite3JoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy406,0); }
-#line 2389 "parse.c"
+#line 471 "parse.y"
+{ yygotominor.yy328 = sqlite3JoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy430,0); }
+#line 2426 "parse.c"
         break;
       case 132:
-#line 464 "parse.y"
-{ yygotominor.yy60 = sqlite3JoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy406,&yymsp[-1].minor.yy406); }
-#line 2394 "parse.c"
+#line 473 "parse.y"
+{ yygotominor.yy328 = sqlite3JoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy430,&yymsp[-1].minor.yy430); }
+#line 2431 "parse.c"
         break;
       case 133:
       case 141:
@@ -2400,9 +2437,9 @@
       case 236:
       case 238:
       case 242:
-#line 468 "parse.y"
-{yygotominor.yy454 = yymsp[0].minor.yy454;}
-#line 2407 "parse.c"
+#line 477 "parse.y"
+{yygotominor.yy418 = yymsp[0].minor.yy418;}
+#line 2444 "parse.c"
         break;
       case 134:
       case 149:
@@ -2411,208 +2448,208 @@
       case 237:
       case 239:
       case 243:
-#line 469 "parse.y"
-{yygotominor.yy454 = 0;}
-#line 2418 "parse.c"
+#line 478 "parse.y"
+{yygotominor.yy418 = 0;}
+#line 2455 "parse.c"
         break;
       case 135:
       case 168:
-#line 473 "parse.y"
-{yygotominor.yy272 = yymsp[-1].minor.yy272;}
-#line 2424 "parse.c"
+#line 482 "parse.y"
+{yygotominor.yy232 = yymsp[-1].minor.yy232;}
+#line 2461 "parse.c"
         break;
       case 136:
       case 167:
-#line 474 "parse.y"
-{yygotominor.yy272 = 0;}
-#line 2430 "parse.c"
+#line 483 "parse.y"
+{yygotominor.yy232 = 0;}
+#line 2467 "parse.c"
         break;
       case 138:
       case 148:
-#line 485 "parse.y"
-{yygotominor.yy266 = yymsp[0].minor.yy266;}
-#line 2436 "parse.c"
+#line 494 "parse.y"
+{yygotominor.yy322 = yymsp[0].minor.yy322;}
+#line 2473 "parse.c"
         break;
       case 139:
-#line 486 "parse.y"
+#line 495 "parse.y"
 {
-  yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-4].minor.yy266,yymsp[-2].minor.yy454,yymsp[-1].minor.yy406.n>0?&yymsp[-1].minor.yy406:0);
-  if( yygotominor.yy266 ) yygotominor.yy266->a[yygotominor.yy266->nExpr-1].sortOrder = yymsp[0].minor.yy60;
+  yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-4].minor.yy322,yymsp[-2].minor.yy418,yymsp[-1].minor.yy430.n>0?&yymsp[-1].minor.yy430:0);
+  if( yygotominor.yy322 ) yygotominor.yy322->a[yygotominor.yy322->nExpr-1].sortOrder = yymsp[0].minor.yy328;
 }
-#line 2444 "parse.c"
+#line 2481 "parse.c"
         break;
       case 140:
-#line 490 "parse.y"
+#line 499 "parse.y"
 {
-  yygotominor.yy266 = sqlite3ExprListAppend(0,yymsp[-2].minor.yy454,yymsp[-1].minor.yy406.n>0?&yymsp[-1].minor.yy406:0);
-  if( yygotominor.yy266 && yygotominor.yy266->a ) yygotominor.yy266->a[0].sortOrder = yymsp[0].minor.yy60;
+  yygotominor.yy322 = sqlite3ExprListAppend(0,yymsp[-2].minor.yy418,yymsp[-1].minor.yy430.n>0?&yymsp[-1].minor.yy430:0);
+  if( yygotominor.yy322 && yygotominor.yy322->a ) yygotominor.yy322->a[0].sortOrder = yymsp[0].minor.yy328;
 }
-#line 2452 "parse.c"
+#line 2489 "parse.c"
         break;
       case 142:
       case 144:
-#line 499 "parse.y"
-{yygotominor.yy60 = SQLITE_SO_ASC;}
-#line 2458 "parse.c"
+#line 508 "parse.y"
+{yygotominor.yy328 = SQLITE_SO_ASC;}
+#line 2495 "parse.c"
         break;
       case 143:
-#line 500 "parse.y"
-{yygotominor.yy60 = SQLITE_SO_DESC;}
-#line 2463 "parse.c"
+#line 509 "parse.y"
+{yygotominor.yy328 = SQLITE_SO_DESC;}
+#line 2500 "parse.c"
         break;
       case 145:
-#line 502 "parse.y"
-{yygotominor.yy406.z = 0; yygotominor.yy406.n = 0;}
-#line 2468 "parse.c"
+#line 511 "parse.y"
+{yygotominor.yy430.z = 0; yygotominor.yy430.n = 0;}
+#line 2505 "parse.c"
         break;
       case 151:
-#line 520 "parse.y"
-{yygotominor.yy348.pLimit = 0; yygotominor.yy348.pOffset = 0;}
-#line 2473 "parse.c"
+#line 529 "parse.y"
+{yygotominor.yy388.pLimit = 0; yygotominor.yy388.pOffset = 0;}
+#line 2510 "parse.c"
         break;
       case 152:
-#line 521 "parse.y"
-{yygotominor.yy348.pLimit = yymsp[0].minor.yy454; yygotominor.yy348.pOffset = 0;}
-#line 2478 "parse.c"
+#line 530 "parse.y"
+{yygotominor.yy388.pLimit = yymsp[0].minor.yy418; yygotominor.yy388.pOffset = 0;}
+#line 2515 "parse.c"
         break;
       case 153:
-#line 523 "parse.y"
-{yygotominor.yy348.pLimit = yymsp[-2].minor.yy454; yygotominor.yy348.pOffset = yymsp[0].minor.yy454;}
-#line 2483 "parse.c"
+#line 532 "parse.y"
+{yygotominor.yy388.pLimit = yymsp[-2].minor.yy418; yygotominor.yy388.pOffset = yymsp[0].minor.yy418;}
+#line 2520 "parse.c"
         break;
       case 154:
-#line 525 "parse.y"
-{yygotominor.yy348.pOffset = yymsp[-2].minor.yy454; yygotominor.yy348.pLimit = yymsp[0].minor.yy454;}
-#line 2488 "parse.c"
+#line 534 "parse.y"
+{yygotominor.yy388.pOffset = yymsp[-2].minor.yy418; yygotominor.yy388.pLimit = yymsp[0].minor.yy418;}
+#line 2525 "parse.c"
         break;
       case 155:
-#line 529 "parse.y"
-{sqlite3DeleteFrom(pParse,yymsp[-1].minor.yy427,yymsp[0].minor.yy454);}
-#line 2493 "parse.c"
+#line 538 "parse.y"
+{sqlite3DeleteFrom(pParse,yymsp[-1].minor.yy439,yymsp[0].minor.yy418);}
+#line 2530 "parse.c"
         break;
       case 158:
-#line 543 "parse.y"
-{sqlite3Update(pParse,yymsp[-3].minor.yy427,yymsp[-1].minor.yy266,yymsp[0].minor.yy454,yymsp[-4].minor.yy60);}
-#line 2498 "parse.c"
+#line 552 "parse.y"
+{sqlite3Update(pParse,yymsp[-3].minor.yy439,yymsp[-1].minor.yy322,yymsp[0].minor.yy418,yymsp[-4].minor.yy328);}
+#line 2535 "parse.c"
         break;
       case 159:
-#line 546 "parse.y"
-{yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-4].minor.yy266,yymsp[0].minor.yy454,&yymsp[-2].minor.yy406);}
-#line 2503 "parse.c"
+#line 555 "parse.y"
+{yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-4].minor.yy322,yymsp[0].minor.yy418,&yymsp[-2].minor.yy430);}
+#line 2540 "parse.c"
         break;
       case 160:
-#line 547 "parse.y"
-{yygotominor.yy266 = sqlite3ExprListAppend(0,yymsp[0].minor.yy454,&yymsp[-2].minor.yy406);}
-#line 2508 "parse.c"
+#line 556 "parse.y"
+{yygotominor.yy322 = sqlite3ExprListAppend(0,yymsp[0].minor.yy418,&yymsp[-2].minor.yy430);}
+#line 2545 "parse.c"
         break;
       case 161:
-#line 553 "parse.y"
-{sqlite3Insert(pParse, yymsp[-5].minor.yy427, yymsp[-1].minor.yy266, 0, yymsp[-4].minor.yy272, yymsp[-7].minor.yy60);}
-#line 2513 "parse.c"
+#line 562 "parse.y"
+{sqlite3Insert(pParse, yymsp[-5].minor.yy439, yymsp[-1].minor.yy322, 0, yymsp[-4].minor.yy232, yymsp[-7].minor.yy328);}
+#line 2550 "parse.c"
         break;
       case 162:
-#line 555 "parse.y"
-{sqlite3Insert(pParse, yymsp[-2].minor.yy427, 0, yymsp[0].minor.yy331, yymsp[-1].minor.yy272, yymsp[-4].minor.yy60);}
-#line 2518 "parse.c"
+#line 564 "parse.y"
+{sqlite3Insert(pParse, yymsp[-2].minor.yy439, 0, yymsp[0].minor.yy91, yymsp[-1].minor.yy232, yymsp[-4].minor.yy328);}
+#line 2555 "parse.c"
         break;
       case 165:
       case 240:
-#line 565 "parse.y"
-{yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-2].minor.yy266,yymsp[0].minor.yy454,0);}
-#line 2524 "parse.c"
+#line 574 "parse.y"
+{yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-2].minor.yy322,yymsp[0].minor.yy418,0);}
+#line 2561 "parse.c"
         break;
       case 166:
       case 241:
-#line 566 "parse.y"
-{yygotominor.yy266 = sqlite3ExprListAppend(0,yymsp[0].minor.yy454,0);}
-#line 2530 "parse.c"
+#line 575 "parse.y"
+{yygotominor.yy322 = sqlite3ExprListAppend(0,yymsp[0].minor.yy418,0);}
+#line 2567 "parse.c"
         break;
       case 169:
-#line 575 "parse.y"
-{yygotominor.yy272 = sqlite3IdListAppend(yymsp[-2].minor.yy272,&yymsp[0].minor.yy406);}
-#line 2535 "parse.c"
+#line 584 "parse.y"
+{yygotominor.yy232 = sqlite3IdListAppend(yymsp[-2].minor.yy232,&yymsp[0].minor.yy430);}
+#line 2572 "parse.c"
         break;
       case 170:
-#line 576 "parse.y"
-{yygotominor.yy272 = sqlite3IdListAppend(0,&yymsp[0].minor.yy406);}
-#line 2540 "parse.c"
+#line 585 "parse.y"
+{yygotominor.yy232 = sqlite3IdListAppend(0,&yymsp[0].minor.yy430);}
+#line 2577 "parse.c"
         break;
       case 172:
-#line 587 "parse.y"
-{yygotominor.yy454 = yymsp[-1].minor.yy454; sqlite3ExprSpan(yygotominor.yy454,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); }
-#line 2545 "parse.c"
+#line 596 "parse.y"
+{yygotominor.yy418 = yymsp[-1].minor.yy418; sqlite3ExprSpan(yygotominor.yy418,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); }
+#line 2582 "parse.c"
         break;
       case 173:
       case 178:
       case 179:
       case 180:
       case 181:
-#line 588 "parse.y"
-{yygotominor.yy454 = sqlite3Expr(yymsp[0].major, 0, 0, &yymsp[0].minor.yy0);}
-#line 2554 "parse.c"
+#line 597 "parse.y"
+{yygotominor.yy418 = sqlite3Expr(yymsp[0].major, 0, 0, &yymsp[0].minor.yy0);}
+#line 2591 "parse.c"
         break;
       case 174:
       case 175:
-#line 589 "parse.y"
-{yygotominor.yy454 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy0);}
-#line 2560 "parse.c"
+#line 598 "parse.y"
+{yygotominor.yy418 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy0);}
+#line 2597 "parse.c"
         break;
       case 176:
-#line 591 "parse.y"
+#line 600 "parse.y"
 {
-  Expr *temp1 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy406);
-  Expr *temp2 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy406);
-  yygotominor.yy454 = sqlite3Expr(TK_DOT, temp1, temp2, 0);
+  Expr *temp1 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy430);
+  Expr *temp2 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy430);
+  yygotominor.yy418 = sqlite3Expr(TK_DOT, temp1, temp2, 0);
 }
-#line 2569 "parse.c"
+#line 2606 "parse.c"
         break;
       case 177:
-#line 596 "parse.y"
+#line 605 "parse.y"
 {
-  Expr *temp1 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-4].minor.yy406);
-  Expr *temp2 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy406);
-  Expr *temp3 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy406);
+  Expr *temp1 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-4].minor.yy430);
+  Expr *temp2 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy430);
+  Expr *temp3 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy430);
   Expr *temp4 = sqlite3Expr(TK_DOT, temp2, temp3, 0);
-  yygotominor.yy454 = sqlite3Expr(TK_DOT, temp1, temp4, 0);
+  yygotominor.yy418 = sqlite3Expr(TK_DOT, temp1, temp4, 0);
 }
-#line 2580 "parse.c"
+#line 2617 "parse.c"
         break;
       case 182:
-#line 607 "parse.y"
-{yygotominor.yy454 = sqlite3RegisterExpr(pParse, &yymsp[0].minor.yy0);}
-#line 2585 "parse.c"
+#line 616 "parse.y"
+{yygotominor.yy418 = sqlite3RegisterExpr(pParse, &yymsp[0].minor.yy0);}
+#line 2622 "parse.c"
         break;
       case 183:
-#line 608 "parse.y"
+#line 617 "parse.y"
 {
   Token *pToken = &yymsp[0].minor.yy0;
-  Expr *pExpr = yygotominor.yy454 = sqlite3Expr(TK_VARIABLE, 0, 0, pToken);
+  Expr *pExpr = yygotominor.yy418 = sqlite3Expr(TK_VARIABLE, 0, 0, pToken);
   sqlite3ExprAssignVarNumber(pParse, pExpr);
 }
-#line 2594 "parse.c"
+#line 2631 "parse.c"
         break;
       case 184:
-#line 613 "parse.y"
+#line 622 "parse.y"
 {
-  yygotominor.yy454 = sqlite3ExprFunction(yymsp[-1].minor.yy266, &yymsp[-3].minor.yy0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3ExprFunction(yymsp[-1].minor.yy322, &yymsp[-3].minor.yy0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
 }
-#line 2602 "parse.c"
+#line 2639 "parse.c"
         break;
       case 185:
-#line 617 "parse.y"
+#line 626 "parse.y"
 {
-  yygotominor.yy454 = sqlite3ExprFunction(0, &yymsp[-3].minor.yy0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3ExprFunction(0, &yymsp[-3].minor.yy0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
 }
-#line 2610 "parse.c"
+#line 2647 "parse.c"
         break;
       case 186:
       case 187:
       case 188:
-#line 621 "parse.y"
-{yygotominor.yy454 = sqlite3Expr(yymsp[0].major,0,0,0);}
-#line 2617 "parse.c"
+#line 630 "parse.y"
+{yygotominor.yy418 = sqlite3Expr(yymsp[0].major,0,0,0);}
+#line 2654 "parse.c"
         break;
       case 189:
       case 190:
@@ -2632,474 +2669,488 @@
       case 204:
       case 205:
       case 206:
-#line 624 "parse.y"
-{yygotominor.yy454 = sqlite3Expr(yymsp[-1].major, yymsp[-2].minor.yy454, yymsp[0].minor.yy454, 0);}
-#line 2639 "parse.c"
+#line 633 "parse.y"
+{yygotominor.yy418 = sqlite3Expr(yymsp[-1].major, yymsp[-2].minor.yy418, yymsp[0].minor.yy418, 0);}
+#line 2676 "parse.c"
         break;
       case 207:
-#line 643 "parse.y"
-{yygotominor.yy258.opcode = TK_LIKE; yygotominor.yy258.not = 0;}
-#line 2644 "parse.c"
+#line 652 "parse.y"
+{yygotominor.yy30.opcode = TK_LIKE; yygotominor.yy30.not = 0;}
+#line 2681 "parse.c"
         break;
       case 208:
-#line 644 "parse.y"
-{yygotominor.yy258.opcode = TK_GLOB; yygotominor.yy258.not = 0;}
-#line 2649 "parse.c"
+#line 653 "parse.y"
+{yygotominor.yy30.opcode = TK_GLOB; yygotominor.yy30.not = 0;}
+#line 2686 "parse.c"
         break;
       case 209:
-#line 645 "parse.y"
-{yygotominor.yy258.opcode = TK_LIKE; yygotominor.yy258.not = 1;}
-#line 2654 "parse.c"
+#line 654 "parse.y"
+{yygotominor.yy30.opcode = TK_LIKE; yygotominor.yy30.not = 1;}
+#line 2691 "parse.c"
         break;
       case 210:
-#line 646 "parse.y"
-{yygotominor.yy258.opcode = TK_GLOB; yygotominor.yy258.not = 1;}
-#line 2659 "parse.c"
+#line 655 "parse.y"
+{yygotominor.yy30.opcode = TK_GLOB; yygotominor.yy30.not = 1;}
+#line 2696 "parse.c"
         break;
       case 213:
-#line 650 "parse.y"
+#line 659 "parse.y"
 {
-  ExprList *pList = sqlite3ExprListAppend(0, yymsp[-1].minor.yy454, 0);
-  pList = sqlite3ExprListAppend(pList, yymsp[-3].minor.yy454, 0);
-  if( yymsp[0].minor.yy454 ){
-    pList = sqlite3ExprListAppend(pList, yymsp[0].minor.yy454, 0);
+  ExprList *pList = sqlite3ExprListAppend(0, yymsp[-1].minor.yy418, 0);
+  pList = sqlite3ExprListAppend(pList, yymsp[-3].minor.yy418, 0);
+  if( yymsp[0].minor.yy418 ){
+    pList = sqlite3ExprListAppend(pList, yymsp[0].minor.yy418, 0);
   }
-  yygotominor.yy454 = sqlite3ExprFunction(pList, 0);
-  if( yygotominor.yy454 ) yygotominor.yy454->op = yymsp[-2].minor.yy258.opcode;
-  if( yymsp[-2].minor.yy258.not ) yygotominor.yy454 = sqlite3Expr(TK_NOT, yygotominor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454, &yymsp[-3].minor.yy454->span, &yymsp[-1].minor.yy454->span);
+  yygotominor.yy418 = sqlite3ExprFunction(pList, 0);
+  if( yygotominor.yy418 ) yygotominor.yy418->op = yymsp[-2].minor.yy30.opcode;
+  if( yymsp[-2].minor.yy30.not ) yygotominor.yy418 = sqlite3Expr(TK_NOT, yygotominor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418, &yymsp[-3].minor.yy418->span, &yymsp[-1].minor.yy418->span);
 }
-#line 2674 "parse.c"
+#line 2711 "parse.c"
         break;
       case 214:
-#line 662 "parse.y"
+#line 671 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_ISNULL, yymsp[-1].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-1].minor.yy454->span,&yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_ISNULL, yymsp[-1].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-1].minor.yy418->span,&yymsp[0].minor.yy0);
 }
-#line 2682 "parse.c"
+#line 2719 "parse.c"
         break;
       case 215:
-#line 666 "parse.y"
+#line 675 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_ISNULL, yymsp[-2].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-2].minor.yy454->span,&yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_ISNULL, yymsp[-2].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-2].minor.yy418->span,&yymsp[0].minor.yy0);
 }
-#line 2690 "parse.c"
+#line 2727 "parse.c"
         break;
       case 216:
-#line 670 "parse.y"
+#line 679 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_NOTNULL, yymsp[-1].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-1].minor.yy454->span,&yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_NOTNULL, yymsp[-1].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-1].minor.yy418->span,&yymsp[0].minor.yy0);
 }
-#line 2698 "parse.c"
+#line 2735 "parse.c"
         break;
       case 217:
-#line 674 "parse.y"
+#line 683 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_NOTNULL, yymsp[-2].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-2].minor.yy454->span,&yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_NOTNULL, yymsp[-2].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-2].minor.yy418->span,&yymsp[0].minor.yy0);
 }
-#line 2706 "parse.c"
+#line 2743 "parse.c"
         break;
       case 218:
-#line 678 "parse.y"
+#line 687 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_NOTNULL, yymsp[-3].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-3].minor.yy454->span,&yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_NOTNULL, yymsp[-3].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-3].minor.yy418->span,&yymsp[0].minor.yy0);
 }
-#line 2714 "parse.c"
+#line 2751 "parse.c"
         break;
       case 219:
       case 220:
-#line 682 "parse.y"
+#line 691 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(yymsp[-1].major, yymsp[0].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy454->span);
+  yygotominor.yy418 = sqlite3Expr(yymsp[-1].major, yymsp[0].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy418->span);
 }
-#line 2723 "parse.c"
+#line 2760 "parse.c"
         break;
       case 221:
-#line 690 "parse.y"
+#line 699 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_UMINUS, yymsp[0].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy454->span);
+  yygotominor.yy418 = sqlite3Expr(TK_UMINUS, yymsp[0].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy418->span);
 }
-#line 2731 "parse.c"
+#line 2768 "parse.c"
         break;
       case 222:
-#line 694 "parse.y"
+#line 703 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_UPLUS, yymsp[0].minor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy454->span);
+  yygotominor.yy418 = sqlite3Expr(TK_UPLUS, yymsp[0].minor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy418->span);
 }
-#line 2739 "parse.c"
+#line 2776 "parse.c"
         break;
       case 225:
-#line 701 "parse.y"
+#line 710 "parse.y"
 {
-  ExprList *pList = sqlite3ExprListAppend(0, yymsp[-2].minor.yy454, 0);
-  pList = sqlite3ExprListAppend(pList, yymsp[0].minor.yy454, 0);
-  yygotominor.yy454 = sqlite3Expr(TK_BETWEEN, yymsp[-4].minor.yy454, 0, 0);
-  if( yygotominor.yy454 ) yygotominor.yy454->pList = pList;
-  if( yymsp[-3].minor.yy60 ) yygotominor.yy454 = sqlite3Expr(TK_NOT, yygotominor.yy454, 0, 0);
-  sqlite3ExprSpan(yygotominor.yy454,&yymsp[-4].minor.yy454->span,&yymsp[0].minor.yy454->span);
+  ExprList *pList = sqlite3ExprListAppend(0, yymsp[-2].minor.yy418, 0);
+  pList = sqlite3ExprListAppend(pList, yymsp[0].minor.yy418, 0);
+  yygotominor.yy418 = sqlite3Expr(TK_BETWEEN, yymsp[-4].minor.yy418, 0, 0);
+  if( yygotominor.yy418 ) yygotominor.yy418->pList = pList;
+  if( yymsp[-3].minor.yy328 ) yygotominor.yy418 = sqlite3Expr(TK_NOT, yygotominor.yy418, 0, 0);
+  sqlite3ExprSpan(yygotominor.yy418,&yymsp[-4].minor.yy418->span,&yymsp[0].minor.yy418->span);
 }
-#line 2751 "parse.c"
+#line 2788 "parse.c"
         break;
       case 228:
-#line 713 "parse.y"
+#line 722 "parse.y"
 {
-    yygotominor.yy454 = sqlite3Expr(TK_IN, yymsp[-4].minor.yy454, 0, 0);
-    if( yygotominor.yy454 ){
-      yygotominor.yy454->pList = yymsp[-1].minor.yy266;
+    yygotominor.yy418 = sqlite3Expr(TK_IN, yymsp[-4].minor.yy418, 0, 0);
+    if( yygotominor.yy418 ){
+      yygotominor.yy418->pList = yymsp[-1].minor.yy322;
     }else{
-      sqlite3ExprListDelete(yymsp[-1].minor.yy266);
+      sqlite3ExprListDelete(yymsp[-1].minor.yy322);
     }
-    if( yymsp[-3].minor.yy60 ) yygotominor.yy454 = sqlite3Expr(TK_NOT, yygotominor.yy454, 0, 0);
-    sqlite3ExprSpan(yygotominor.yy454,&yymsp[-4].minor.yy454->span,&yymsp[0].minor.yy0);
+    if( yymsp[-3].minor.yy328 ) yygotominor.yy418 = sqlite3Expr(TK_NOT, yygotominor.yy418, 0, 0);
+    sqlite3ExprSpan(yygotominor.yy418,&yymsp[-4].minor.yy418->span,&yymsp[0].minor.yy0);
   }
-#line 2765 "parse.c"
+#line 2802 "parse.c"
         break;
       case 229:
-#line 723 "parse.y"
+#line 732 "parse.y"
 {
-    yygotominor.yy454 = sqlite3Expr(TK_SELECT, 0, 0, 0);
-    if( yygotominor.yy454 ) yygotominor.yy454->pSelect = yymsp[-1].minor.yy331;
-    if( !yygotominor.yy454 ) sqlite3SelectDelete(yymsp[-1].minor.yy331);
-    sqlite3ExprSpan(yygotominor.yy454,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
+    yygotominor.yy418 = sqlite3Expr(TK_SELECT, 0, 0, 0);
+    if( yygotominor.yy418 ) yygotominor.yy418->pSelect = yymsp[-1].minor.yy91;
+    if( !yygotominor.yy418 ) sqlite3SelectDelete(yymsp[-1].minor.yy91);
+    sqlite3ExprSpan(yygotominor.yy418,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
   }
-#line 2775 "parse.c"
+#line 2812 "parse.c"
         break;
       case 230:
-#line 729 "parse.y"
+#line 738 "parse.y"
 {
-    yygotominor.yy454 = sqlite3Expr(TK_IN, yymsp[-4].minor.yy454, 0, 0);
-    if( yygotominor.yy454 ) yygotominor.yy454->pSelect = yymsp[-1].minor.yy331;
-    if( !yygotominor.yy454 ) sqlite3SelectDelete(yymsp[-1].minor.yy331);
-    if( yymsp[-3].minor.yy60 ) yygotominor.yy454 = sqlite3Expr(TK_NOT, yygotominor.yy454, 0, 0);
-    sqlite3ExprSpan(yygotominor.yy454,&yymsp[-4].minor.yy454->span,&yymsp[0].minor.yy0);
+    yygotominor.yy418 = sqlite3Expr(TK_IN, yymsp[-4].minor.yy418, 0, 0);
+    if( yygotominor.yy418 ) yygotominor.yy418->pSelect = yymsp[-1].minor.yy91;
+    if( !yygotominor.yy418 ) sqlite3SelectDelete(yymsp[-1].minor.yy91);
+    if( yymsp[-3].minor.yy328 ) yygotominor.yy418 = sqlite3Expr(TK_NOT, yygotominor.yy418, 0, 0);
+    sqlite3ExprSpan(yygotominor.yy418,&yymsp[-4].minor.yy418->span,&yymsp[0].minor.yy0);
   }
-#line 2786 "parse.c"
+#line 2823 "parse.c"
         break;
       case 231:
-#line 736 "parse.y"
+#line 745 "parse.y"
 {
-    SrcList *pSrc = sqlite3SrcListAppend(0,&yymsp[-1].minor.yy406,&yymsp[0].minor.yy406);
-    yygotominor.yy454 = sqlite3Expr(TK_IN, yymsp[-3].minor.yy454, 0, 0);
-    if( yygotominor.yy454 ) yygotominor.yy454->pSelect = sqlite3SelectNew(0,pSrc,0,0,0,0,0,0,0);
-    if( yymsp[-2].minor.yy60 ) yygotominor.yy454 = sqlite3Expr(TK_NOT, yygotominor.yy454, 0, 0);
-    sqlite3ExprSpan(yygotominor.yy454,&yymsp[-3].minor.yy454->span,yymsp[0].minor.yy406.z?&yymsp[0].minor.yy406:&yymsp[-1].minor.yy406);
+    SrcList *pSrc = sqlite3SrcListAppend(0,&yymsp[-1].minor.yy430,&yymsp[0].minor.yy430);
+    yygotominor.yy418 = sqlite3Expr(TK_IN, yymsp[-3].minor.yy418, 0, 0);
+    if( yygotominor.yy418 ) yygotominor.yy418->pSelect = sqlite3SelectNew(0,pSrc,0,0,0,0,0,0,0);
+    if( yymsp[-2].minor.yy328 ) yygotominor.yy418 = sqlite3Expr(TK_NOT, yygotominor.yy418, 0, 0);
+    sqlite3ExprSpan(yygotominor.yy418,&yymsp[-3].minor.yy418->span,yymsp[0].minor.yy430.z?&yymsp[0].minor.yy430:&yymsp[-1].minor.yy430);
   }
-#line 2797 "parse.c"
+#line 2834 "parse.c"
         break;
       case 232:
-#line 743 "parse.y"
+#line 752 "parse.y"
 {
-    Expr *p = yygotominor.yy454 = sqlite3Expr(TK_EXISTS, 0, 0, 0);
+    Expr *p = yygotominor.yy418 = sqlite3Expr(TK_EXISTS, 0, 0, 0);
     if( p ){
-      p->pSelect = yymsp[-1].minor.yy331;
+      p->pSelect = yymsp[-1].minor.yy91;
       sqlite3ExprSpan(p,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
     }
-    if( !p ) sqlite3SelectDelete(yymsp[-1].minor.yy331);
+    if( !p ) sqlite3SelectDelete(yymsp[-1].minor.yy91);
   }
-#line 2809 "parse.c"
+#line 2846 "parse.c"
         break;
       case 233:
-#line 754 "parse.y"
+#line 763 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_CASE, yymsp[-3].minor.yy454, yymsp[-1].minor.yy454, 0);
-  if( yygotominor.yy454 ) yygotominor.yy454->pList = yymsp[-2].minor.yy266;
-  sqlite3ExprSpan(yygotominor.yy454, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_CASE, yymsp[-3].minor.yy418, yymsp[-1].minor.yy418, 0);
+  if( yygotominor.yy418 ) yygotominor.yy418->pList = yymsp[-2].minor.yy322;
+  sqlite3ExprSpan(yygotominor.yy418, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0);
 }
-#line 2818 "parse.c"
+#line 2855 "parse.c"
         break;
       case 234:
-#line 761 "parse.y"
+#line 770 "parse.y"
 {
-  yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-4].minor.yy266, yymsp[-2].minor.yy454, 0);
-  yygotominor.yy266 = sqlite3ExprListAppend(yygotominor.yy266, yymsp[0].minor.yy454, 0);
+  yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-4].minor.yy322, yymsp[-2].minor.yy418, 0);
+  yygotominor.yy322 = sqlite3ExprListAppend(yygotominor.yy322, yymsp[0].minor.yy418, 0);
 }
-#line 2826 "parse.c"
+#line 2863 "parse.c"
         break;
       case 235:
-#line 765 "parse.y"
+#line 774 "parse.y"
 {
-  yygotominor.yy266 = sqlite3ExprListAppend(0, yymsp[-2].minor.yy454, 0);
-  yygotominor.yy266 = sqlite3ExprListAppend(yygotominor.yy266, yymsp[0].minor.yy454, 0);
+  yygotominor.yy322 = sqlite3ExprListAppend(0, yymsp[-2].minor.yy418, 0);
+  yygotominor.yy322 = sqlite3ExprListAppend(yygotominor.yy322, yymsp[0].minor.yy418, 0);
 }
-#line 2834 "parse.c"
+#line 2871 "parse.c"
         break;
       case 244:
-#line 790 "parse.y"
+#line 799 "parse.y"
 {
-  if( yymsp[-9].minor.yy60!=OE_None ) yymsp[-9].minor.yy60 = yymsp[0].minor.yy60;
-  if( yymsp[-9].minor.yy60==OE_Default) yymsp[-9].minor.yy60 = OE_Abort;
-  sqlite3CreateIndex(pParse, &yymsp[-7].minor.yy406, &yymsp[-6].minor.yy406, sqlite3SrcListAppend(0,&yymsp[-4].minor.yy406,0),yymsp[-2].minor.yy266,yymsp[-9].minor.yy60, &yymsp[-10].minor.yy0, &yymsp[-1].minor.yy0);
+  if( yymsp[-9].minor.yy328!=OE_None ) yymsp[-9].minor.yy328 = yymsp[0].minor.yy328;
+  if( yymsp[-9].minor.yy328==OE_Default) yymsp[-9].minor.yy328 = OE_Abort;
+  sqlite3CreateIndex(pParse, &yymsp[-7].minor.yy430, &yymsp[-6].minor.yy430, sqlite3SrcListAppend(0,&yymsp[-4].minor.yy430,0),yymsp[-2].minor.yy322,yymsp[-9].minor.yy328, &yymsp[-10].minor.yy0, &yymsp[-1].minor.yy0);
 }
-#line 2843 "parse.c"
+#line 2880 "parse.c"
         break;
       case 245:
       case 292:
-#line 797 "parse.y"
-{yygotominor.yy60 = OE_Abort;}
-#line 2849 "parse.c"
+#line 806 "parse.y"
+{yygotominor.yy328 = OE_Abort;}
+#line 2886 "parse.c"
         break;
       case 246:
-#line 798 "parse.y"
-{yygotominor.yy60 = OE_None;}
-#line 2854 "parse.c"
+#line 807 "parse.y"
+{yygotominor.yy328 = OE_None;}
+#line 2891 "parse.c"
         break;
       case 249:
-#line 808 "parse.y"
+#line 817 "parse.y"
 {
   Expr *p = 0;
-  if( yymsp[-1].minor.yy406.n>0 ){
+  if( yymsp[-1].minor.yy430.n>0 ){
     p = sqlite3Expr(TK_COLUMN, 0, 0, 0);
-    if( p ) p->pColl = sqlite3LocateCollSeq(pParse, yymsp[-1].minor.yy406.z, yymsp[-1].minor.yy406.n);
+    if( p ) p->pColl = sqlite3LocateCollSeq(pParse, yymsp[-1].minor.yy430.z, yymsp[-1].minor.yy430.n);
   }
-  yygotominor.yy266 = sqlite3ExprListAppend(yymsp[-4].minor.yy266, p, &yymsp[-2].minor.yy406);
+  yygotominor.yy322 = sqlite3ExprListAppend(yymsp[-4].minor.yy322, p, &yymsp[-2].minor.yy430);
 }
-#line 2866 "parse.c"
+#line 2903 "parse.c"
         break;
       case 250:
-#line 816 "parse.y"
+#line 825 "parse.y"
 {
   Expr *p = 0;
-  if( yymsp[-1].minor.yy406.n>0 ){
+  if( yymsp[-1].minor.yy430.n>0 ){
     p = sqlite3Expr(TK_COLUMN, 0, 0, 0);
-    if( p ) p->pColl = sqlite3LocateCollSeq(pParse, yymsp[-1].minor.yy406.z, yymsp[-1].minor.yy406.n);
+    if( p ) p->pColl = sqlite3LocateCollSeq(pParse, yymsp[-1].minor.yy430.z, yymsp[-1].minor.yy430.n);
   }
-  yygotominor.yy266 = sqlite3ExprListAppend(0, p, &yymsp[-2].minor.yy406);
+  yygotominor.yy322 = sqlite3ExprListAppend(0, p, &yymsp[-2].minor.yy430);
 }
-#line 2878 "parse.c"
+#line 2915 "parse.c"
         break;
       case 252:
-#line 829 "parse.y"
-{sqlite3DropIndex(pParse, yymsp[0].minor.yy427);}
-#line 2883 "parse.c"
+#line 838 "parse.y"
+{sqlite3DropIndex(pParse, yymsp[0].minor.yy439);}
+#line 2920 "parse.c"
         break;
       case 253:
       case 254:
-#line 833 "parse.y"
+#line 842 "parse.y"
 {sqlite3Vacuum(pParse,0);}
-#line 2889 "parse.c"
+#line 2926 "parse.c"
         break;
       case 255:
       case 257:
-#line 839 "parse.y"
-{sqlite3Pragma(pParse,&yymsp[-3].minor.yy406,&yymsp[-2].minor.yy406,&yymsp[0].minor.yy406,0);}
-#line 2895 "parse.c"
+#line 848 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-3].minor.yy430,&yymsp[-2].minor.yy430,&yymsp[0].minor.yy430,0);}
+#line 2932 "parse.c"
         break;
       case 256:
-#line 840 "parse.y"
-{sqlite3Pragma(pParse,&yymsp[-3].minor.yy406,&yymsp[-2].minor.yy406,&yymsp[0].minor.yy0,0);}
-#line 2900 "parse.c"
+#line 849 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-3].minor.yy430,&yymsp[-2].minor.yy430,&yymsp[0].minor.yy0,0);}
+#line 2937 "parse.c"
         break;
       case 258:
-#line 842 "parse.y"
+#line 851 "parse.y"
 {
-  sqlite3Pragma(pParse,&yymsp[-3].minor.yy406,&yymsp[-2].minor.yy406,&yymsp[0].minor.yy406,1);
+  sqlite3Pragma(pParse,&yymsp[-3].minor.yy430,&yymsp[-2].minor.yy430,&yymsp[0].minor.yy430,1);
 }
-#line 2907 "parse.c"
+#line 2944 "parse.c"
         break;
       case 259:
-#line 845 "parse.y"
-{sqlite3Pragma(pParse,&yymsp[-4].minor.yy406,&yymsp[-3].minor.yy406,&yymsp[-1].minor.yy406,0);}
-#line 2912 "parse.c"
+#line 854 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-4].minor.yy430,&yymsp[-3].minor.yy430,&yymsp[-1].minor.yy430,0);}
+#line 2949 "parse.c"
         break;
       case 260:
-#line 846 "parse.y"
-{sqlite3Pragma(pParse,&yymsp[-1].minor.yy406,&yymsp[0].minor.yy406,0,0);}
-#line 2917 "parse.c"
+#line 855 "parse.y"
+{sqlite3Pragma(pParse,&yymsp[-1].minor.yy430,&yymsp[0].minor.yy430,0,0);}
+#line 2954 "parse.c"
         break;
       case 267:
-#line 859 "parse.y"
+#line 868 "parse.y"
 {
   Token all;
-  all.z = yymsp[-3].minor.yy406.z;
-  all.n = (yymsp[0].minor.yy0.z - yymsp[-3].minor.yy406.z) + yymsp[0].minor.yy0.n;
-  sqlite3FinishTrigger(pParse, yymsp[-1].minor.yy455, &all);
+  all.z = yymsp[-3].minor.yy430.z;
+  all.n = (yymsp[0].minor.yy0.z - yymsp[-3].minor.yy430.z) + yymsp[0].minor.yy0.n;
+  sqlite3FinishTrigger(pParse, yymsp[-1].minor.yy451, &all);
 }
-#line 2927 "parse.c"
+#line 2964 "parse.c"
         break;
       case 268:
-#line 868 "parse.y"
+#line 877 "parse.y"
 {
-  sqlite3BeginTrigger(pParse, &yymsp[-7].minor.yy406, &yymsp[-6].minor.yy406, yymsp[-5].minor.yy60, yymsp[-4].minor.yy62.a, yymsp[-4].minor.yy62.b, yymsp[-2].minor.yy427, yymsp[-1].minor.yy60, yymsp[0].minor.yy454, yymsp[-9].minor.yy60);
-  yygotominor.yy406 = (yymsp[-6].minor.yy406.n==0?yymsp[-7].minor.yy406:yymsp[-6].minor.yy406);
+  sqlite3BeginTrigger(pParse, &yymsp[-7].minor.yy430, &yymsp[-6].minor.yy430, yymsp[-5].minor.yy328, yymsp[-4].minor.yy378.a, yymsp[-4].minor.yy378.b, yymsp[-2].minor.yy439, yymsp[-1].minor.yy328, yymsp[0].minor.yy418, yymsp[-9].minor.yy328);
+  yygotominor.yy430 = (yymsp[-6].minor.yy430.n==0?yymsp[-7].minor.yy430:yymsp[-6].minor.yy430);
 }
-#line 2935 "parse.c"
+#line 2972 "parse.c"
         break;
       case 269:
       case 272:
-#line 874 "parse.y"
-{ yygotominor.yy60 = TK_BEFORE; }
-#line 2941 "parse.c"
+#line 883 "parse.y"
+{ yygotominor.yy328 = TK_BEFORE; }
+#line 2978 "parse.c"
         break;
       case 270:
-#line 875 "parse.y"
-{ yygotominor.yy60 = TK_AFTER;  }
-#line 2946 "parse.c"
+#line 884 "parse.y"
+{ yygotominor.yy328 = TK_AFTER;  }
+#line 2983 "parse.c"
         break;
       case 271:
-#line 876 "parse.y"
-{ yygotominor.yy60 = TK_INSTEAD;}
-#line 2951 "parse.c"
+#line 885 "parse.y"
+{ yygotominor.yy328 = TK_INSTEAD;}
+#line 2988 "parse.c"
         break;
       case 273:
       case 274:
       case 275:
-#line 881 "parse.y"
-{yygotominor.yy62.a = yymsp[0].major; yygotominor.yy62.b = 0;}
-#line 2958 "parse.c"
+#line 890 "parse.y"
+{yygotominor.yy378.a = yymsp[0].major; yygotominor.yy378.b = 0;}
+#line 2995 "parse.c"
         break;
       case 276:
-#line 884 "parse.y"
-{yygotominor.yy62.a = TK_UPDATE; yygotominor.yy62.b = yymsp[0].minor.yy272;}
-#line 2963 "parse.c"
+#line 893 "parse.y"
+{yygotominor.yy378.a = TK_UPDATE; yygotominor.yy378.b = yymsp[0].minor.yy232;}
+#line 3000 "parse.c"
         break;
       case 277:
       case 278:
-#line 887 "parse.y"
-{ yygotominor.yy60 = TK_ROW; }
-#line 2969 "parse.c"
+#line 896 "parse.y"
+{ yygotominor.yy328 = TK_ROW; }
+#line 3006 "parse.c"
         break;
       case 279:
-#line 889 "parse.y"
-{ yygotominor.yy60 = TK_STATEMENT; }
-#line 2974 "parse.c"
+#line 898 "parse.y"
+{ yygotominor.yy328 = TK_STATEMENT; }
+#line 3011 "parse.c"
         break;
       case 280:
-#line 892 "parse.y"
-{ yygotominor.yy454 = 0; }
-#line 2979 "parse.c"
+#line 901 "parse.y"
+{ yygotominor.yy418 = 0; }
+#line 3016 "parse.c"
         break;
       case 281:
-#line 893 "parse.y"
-{ yygotominor.yy454 = yymsp[0].minor.yy454; }
-#line 2984 "parse.c"
+#line 902 "parse.y"
+{ yygotominor.yy418 = yymsp[0].minor.yy418; }
+#line 3021 "parse.c"
         break;
       case 282:
-#line 897 "parse.y"
+#line 906 "parse.y"
 {
-  yymsp[-2].minor.yy455->pNext = yymsp[0].minor.yy455;
-  yygotominor.yy455 = yymsp[-2].minor.yy455;
+  yymsp[-2].minor.yy451->pNext = yymsp[0].minor.yy451;
+  yygotominor.yy451 = yymsp[-2].minor.yy451;
 }
-#line 2992 "parse.c"
+#line 3029 "parse.c"
         break;
       case 283:
-#line 901 "parse.y"
-{ yygotominor.yy455 = 0; }
-#line 2997 "parse.c"
+#line 910 "parse.y"
+{ yygotominor.yy451 = 0; }
+#line 3034 "parse.c"
         break;
       case 284:
-#line 907 "parse.y"
-{ yygotominor.yy455 = sqlite3TriggerUpdateStep(&yymsp[-3].minor.yy406, yymsp[-1].minor.yy266, yymsp[0].minor.yy454, yymsp[-4].minor.yy60); }
-#line 3002 "parse.c"
+#line 916 "parse.y"
+{ yygotominor.yy451 = sqlite3TriggerUpdateStep(&yymsp[-3].minor.yy430, yymsp[-1].minor.yy322, yymsp[0].minor.yy418, yymsp[-4].minor.yy328); }
+#line 3039 "parse.c"
         break;
       case 285:
-#line 912 "parse.y"
-{yygotominor.yy455 = sqlite3TriggerInsertStep(&yymsp[-5].minor.yy406, yymsp[-4].minor.yy272, yymsp[-1].minor.yy266, 0, yymsp[-7].minor.yy60);}
-#line 3007 "parse.c"
+#line 921 "parse.y"
+{yygotominor.yy451 = sqlite3TriggerInsertStep(&yymsp[-5].minor.yy430, yymsp[-4].minor.yy232, yymsp[-1].minor.yy322, 0, yymsp[-7].minor.yy328);}
+#line 3044 "parse.c"
         break;
       case 286:
-#line 915 "parse.y"
-{yygotominor.yy455 = sqlite3TriggerInsertStep(&yymsp[-2].minor.yy406, yymsp[-1].minor.yy272, 0, yymsp[0].minor.yy331, yymsp[-4].minor.yy60);}
-#line 3012 "parse.c"
+#line 924 "parse.y"
+{yygotominor.yy451 = sqlite3TriggerInsertStep(&yymsp[-2].minor.yy430, yymsp[-1].minor.yy232, 0, yymsp[0].minor.yy91, yymsp[-4].minor.yy328);}
+#line 3049 "parse.c"
         break;
       case 287:
-#line 919 "parse.y"
-{yygotominor.yy455 = sqlite3TriggerDeleteStep(&yymsp[-1].minor.yy406, yymsp[0].minor.yy454);}
-#line 3017 "parse.c"
+#line 928 "parse.y"
+{yygotominor.yy451 = sqlite3TriggerDeleteStep(&yymsp[-1].minor.yy430, yymsp[0].minor.yy418);}
+#line 3054 "parse.c"
         break;
       case 288:
-#line 922 "parse.y"
-{yygotominor.yy455 = sqlite3TriggerSelectStep(yymsp[0].minor.yy331); }
-#line 3022 "parse.c"
+#line 931 "parse.y"
+{yygotominor.yy451 = sqlite3TriggerSelectStep(yymsp[0].minor.yy91); }
+#line 3059 "parse.c"
         break;
       case 289:
-#line 925 "parse.y"
+#line 934 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_RAISE, 0, 0, 0); 
-  yygotominor.yy454->iColumn = OE_Ignore;
-  sqlite3ExprSpan(yygotominor.yy454, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_RAISE, 0, 0, 0); 
+  yygotominor.yy418->iColumn = OE_Ignore;
+  sqlite3ExprSpan(yygotominor.yy418, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
 }
-#line 3031 "parse.c"
+#line 3068 "parse.c"
         break;
       case 290:
-#line 930 "parse.y"
+#line 939 "parse.y"
 {
-  yygotominor.yy454 = sqlite3Expr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy406); 
-  yygotominor.yy454->iColumn = yymsp[-3].minor.yy60;
-  sqlite3ExprSpan(yygotominor.yy454, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0);
+  yygotominor.yy418 = sqlite3Expr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy430); 
+  yygotominor.yy418->iColumn = yymsp[-3].minor.yy328;
+  sqlite3ExprSpan(yygotominor.yy418, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0);
 }
-#line 3040 "parse.c"
+#line 3077 "parse.c"
         break;
       case 291:
-#line 938 "parse.y"
-{yygotominor.yy60 = OE_Rollback;}
-#line 3045 "parse.c"
+#line 947 "parse.y"
+{yygotominor.yy328 = OE_Rollback;}
+#line 3082 "parse.c"
         break;
       case 293:
-#line 940 "parse.y"
-{yygotominor.yy60 = OE_Fail;}
-#line 3050 "parse.c"
+#line 949 "parse.y"
+{yygotominor.yy328 = OE_Fail;}
+#line 3087 "parse.c"
         break;
       case 294:
-#line 945 "parse.y"
+#line 954 "parse.y"
 {
-  sqlite3DropTrigger(pParse,yymsp[0].minor.yy427);
+  sqlite3DropTrigger(pParse,yymsp[0].minor.yy439);
 }
-#line 3057 "parse.c"
+#line 3094 "parse.c"
         break;
       case 295:
-#line 951 "parse.y"
+#line 960 "parse.y"
 {
-  sqlite3Attach(pParse, &yymsp[-3].minor.yy406, &yymsp[-1].minor.yy406, yymsp[0].minor.yy40.type, &yymsp[0].minor.yy40.key);
+  sqlite3Attach(pParse, &yymsp[-3].minor.yy430, &yymsp[-1].minor.yy430, yymsp[0].minor.yy92.type, &yymsp[0].minor.yy92.key);
 }
-#line 3064 "parse.c"
+#line 3101 "parse.c"
         break;
       case 296:
-#line 955 "parse.y"
-{ yygotominor.yy40.type = 0; }
-#line 3069 "parse.c"
+#line 964 "parse.y"
+{ yygotominor.yy92.type = 0; }
+#line 3106 "parse.c"
         break;
       case 297:
-#line 956 "parse.y"
-{ yygotominor.yy40.type=1; yygotominor.yy40.key = yymsp[0].minor.yy406; }
-#line 3074 "parse.c"
+#line 965 "parse.y"
+{ yygotominor.yy92.type=1; yygotominor.yy92.key = yymsp[0].minor.yy430; }
+#line 3111 "parse.c"
         break;
       case 298:
-#line 957 "parse.y"
-{ yygotominor.yy40.type=2; yygotominor.yy40.key = yymsp[0].minor.yy0; }
-#line 3079 "parse.c"
+#line 966 "parse.y"
+{ yygotominor.yy92.type=2; yygotominor.yy92.key = yymsp[0].minor.yy0; }
+#line 3116 "parse.c"
         break;
       case 301:
-#line 963 "parse.y"
+#line 972 "parse.y"
 {
-  sqlite3Detach(pParse, &yymsp[0].minor.yy406);
+  sqlite3Detach(pParse, &yymsp[0].minor.yy430);
 }
-#line 3086 "parse.c"
+#line 3123 "parse.c"
         break;
       case 302:
-#line 969 "parse.y"
+#line 978 "parse.y"
 {sqlite3Reindex(pParse, 0, 0);}
-#line 3091 "parse.c"
+#line 3128 "parse.c"
         break;
       case 303:
-#line 970 "parse.y"
-{sqlite3Reindex(pParse, &yymsp[-1].minor.yy406, &yymsp[0].minor.yy406);}
-#line 3096 "parse.c"
+#line 979 "parse.y"
+{sqlite3Reindex(pParse, &yymsp[-1].minor.yy430, &yymsp[0].minor.yy430);}
+#line 3133 "parse.c"
         break;
       case 304:
-#line 975 "parse.y"
+#line 984 "parse.y"
 {
-  sqlite3AlterRenameTable(pParse,yymsp[-3].minor.yy427,&yymsp[0].minor.yy406);
+  sqlite3AlterRenameTable(pParse,yymsp[-3].minor.yy439,&yymsp[0].minor.yy430);
 }
-#line 3103 "parse.c"
+#line 3140 "parse.c"
         break;
+      case 305:
+#line 987 "parse.y"
+{
+  sqlite3AlterFinishAddColumn(pParse, &yymsp[0].minor.yy430);
+}
+#line 3147 "parse.c"
+        break;
+      case 306:
+#line 990 "parse.y"
+{
+  sqlite3AlterBeginAddColumn(pParse, yymsp[0].minor.yy439);
+}
+#line 3154 "parse.c"
+        break;
   };
   yygoto = yyRuleInfo[yyruleno].lhs;
   yysize = yyRuleInfo[yyruleno].nrhs;
@@ -3164,7 +3215,7 @@
       sqlite3ErrorMsg(pParse, "incomplete SQL statement");
     }
   }
-#line 3170 "parse.c"
+#line 3221 "parse.c"
   sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
 }
 
--- sqlite/parse.h
+++ sqlite/parse.h
@@ -138,3 +138,5 @@
 #define TK_ELSE                           138
 #define TK_INDEX                          139
 #define TK_TO                             140
+#define TK_ADD                            141
+#define TK_COLUMNKW                       142
--- sqlite/pragma.c
+++ sqlite/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.90 2005/02/26 18:10:44 drh Exp $
+** $Id: pragma.c,v 1.91 2005/03/29 03:10:59 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -645,6 +645,8 @@
       HashElem *x;
       int cnt = 0;
 
+      if( OMIT_TEMPDB && i==1 ) continue;
+
       sqlite3CodeVerifySchema(pParse, i);
 
       /* Do an integrity check of the B-Tree
--- sqlite/select.c
+++ sqlite/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.241 2005/02/12 08:59:57 danielk1977 Exp $
+** $Id: select.c,v 1.243 2005/03/28 03:39:56 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -890,6 +890,11 @@
       zName = sqlite3MPrintf("column%d", i+1);
     }
     sqlite3Dequote(zName);
+    if( sqlite3_malloc_failed ){
+      sqliteFree(zName);
+      sqlite3DeleteTable(0, pTab);
+      return 0;
+    }
 
     /* Make sure the column name is unique.  If the name is not unique,
     ** append a integer to the name so that it becomes unique.
@@ -899,6 +904,7 @@
       if( sqlite3StrICmp(aCol[j].zName, zName)==0 ){
         zName = sqlite3MPrintf("%s:%d", zBasename, ++cnt);
         j = -1;
+        if( zName==0 ) break;
       }
     }
     if( zBasename!=zName ){
@@ -955,7 +961,7 @@
   Table *pTab;
   struct SrcList_item *pFrom;
 
-  if( p==0 || p->pSrc==0 ) return 1;
+  if( p==0 || p->pSrc==0 || sqlite3_malloc_failed ) return 1;
   pTabList = p->pSrc;
   pEList = p->pEList;
 
--- sqlite/sqlite3.h
+++ sqlite/sqlite3.h
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.130 2005/02/05 07:33:35 danielk1977 Exp $
+** @(#) $Id: sqlite.h.in,v 1.131 2005/03/21 04:04:03 danielk1977 Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -31,7 +31,7 @@
 #ifdef SQLITE_VERSION
 # undef SQLITE_VERSION
 #endif
-#define SQLITE_VERSION         "3.1.6"
+#define SQLITE_VERSION         "3.2.1"
 
 /*
 ** The format of the version string is "X.Y.Z<trailing string>", where
@@ -48,7 +48,7 @@
 #ifdef SQLITE_VERSION_NUMBER
 # undef SQLITE_VERSION_NUMBER
 #endif
-#define SQLITE_VERSION_NUMBER 3001006
+#define SQLITE_VERSION_NUMBER 3002001
 
 /*
 ** The version string is also compiled into the library so that a program
@@ -1215,11 +1215,32 @@
 ** is NULL pointer, then SQLite does a search for an appropriate temporary
 ** file directory.
 **
-** Once sqlite3_open() has been called, changing this variable will invalidate the
-** current temporary database, if any.
+** Once sqlite3_open() has been called, changing this variable will invalidate
+** the current temporary database, if any.
 */
 extern char *sqlite3_temp_directory;
 
+/*
+** This function is called to recover from a malloc() failure that occured
+** within the SQLite library. Normally, after a single malloc() fails the 
+** library refuses to function (all major calls return SQLITE_NOMEM).
+** This function library state so that it can be used again.
+**
+** All existing statements (sqlite3_stmt pointers) must be finalized or
+** reset before this call is made. Otherwise, SQLITE_BUSY is returned.
+** If any in-memory databases are in use, either as a main or TEMP
+** database, SQLITE_ERROR is returned. In either of these cases, the 
+** library is not reset and remains unusable.
+**
+** This function is *not* threadsafe. Calling this from within a threaded
+** application when threads other than the caller have used SQLite is
+** dangerous and will almost certainly result in malfunctions.
+**
+** This functionality can be omitted from a build by defining the 
+** SQLITE_OMIT_GLOBALRECOVER at compile time.
+*/
+int sqlite3_global_recover();
+
 #ifdef __cplusplus
 }  /* End of the 'extern "C"' block */
 #endif
--- sqlite/sqliteInt.h
+++ sqlite/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.372 2005/03/09 12:26:51 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.375 2005/03/29 03:10:59 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -68,6 +68,17 @@
 #endif
 
 /*
+** OMIT_TEMPDB is set to 1 if SQLITE_OMIT_TEMPDB is defined, or 0
+** afterward. Having this macro allows us to cause the C compiler 
+** to omit code used by TEMP tables without messy #ifndef statements.
+*/
+#ifdef SQLITE_OMIT_TEMPDB
+#define OMIT_TEMPDB 1
+#else
+#define OMIT_TEMPDB 0
+#endif
+
+/*
 ** If the following macro is set to 1, then NULL values are considered
 ** distinct for the SELECT DISTINCT statement and for UNION or EXCEPT
 ** compound queries.  No other SQL database engine (among those tested) 
@@ -292,7 +303,7 @@
 /*
 ** The name of the schema table.
 */
-#define SCHEMA_TABLE(x)  (x==1?TEMP_MASTER_NAME:MASTER_NAME)
+#define SCHEMA_TABLE(x)  ((!OMIT_TEMPDB)&&(x==1)?TEMP_MASTER_NAME:MASTER_NAME)
 
 /*
 ** A convenience macro that returns the number of elements in
@@ -452,6 +463,9 @@
   sqlite3_value *pErr;          /* Most recent error message */
   char *zErrMsg;                /* Most recent error message (UTF-8 encoded) */
   char *zErrMsg16;              /* Most recent error message (UTF-16 encoded) */
+#ifndef SQLITE_OMIT_GLOBALRECOVER
+  sqlite3 *pNext;               /* Linked list of open db handles. */
+#endif
 };
 
 /*
@@ -611,6 +625,9 @@
   Trigger *pTrigger; /* List of SQL triggers on this table */
   FKey *pFKey;       /* Linked list of all foreign keys in this table */
   char *zColAff;     /* String defining the affinity of each column */
+#ifndef SQLITE_OMIT_ALTERTABLE
+  int addColOffset;  /* Offset in CREATE TABLE statement to add a new column */
+#endif
 };
 
 /*
@@ -1367,7 +1384,7 @@
 void sqlite3AddColumnType(Parse*,Token*,Token*);
 void sqlite3AddDefaultValue(Parse*,Expr*);
 void sqlite3AddCollateType(Parse*, const char*, int);
-void sqlite3EndTable(Parse*,Token*,Select*);
+void sqlite3EndTable(Parse*,Token*,Token*,Select*);
 
 #ifndef SQLITE_OMIT_VIEW
   void sqlite3CreateView(Parse*,Token*,Token*,Token*,Select*,int);
@@ -1554,5 +1571,7 @@
 void sqlite3CodeSubselect(Parse *, Expr *);
 int sqlite3SelectResolve(Parse *, Select *, NameContext *);
 void sqlite3ColumnDefault(Vdbe *, Table *, int);
+void sqlite3AlterFinishAddColumn(Parse *, Token *);
+void sqlite3AlterBeginAddColumn(Parse *, SrcList *);
 
 #endif
--- sqlite/trigger.c
+++ sqlite/trigger.c
@@ -197,9 +197,9 @@
   sqlite3 *db = pParse->db;  /* The database */
   DbFixer sFix;
 
-  if( pParse->nErr || pParse->pNewTrigger==0 ) goto triggerfinish_cleanup;
   pTrig = pParse->pNewTrigger;
   pParse->pNewTrigger = 0;
+  if( pParse->nErr || pTrig==0 ) goto triggerfinish_cleanup;
   pTrig->step_list = pStepList;
   while( pStepList ){
     pStepList->pTrig = pTrig;
@@ -439,7 +439,7 @@
   zDb = pName->a[0].zDatabase;
   zName = pName->a[0].zName;
   nName = strlen(zName);
-  for(i=0; i<db->nDb; i++){
+  for(i=OMIT_TEMPDB; i<db->nDb; i++){
     int j = (i<2) ? i^1 : i;  /* Search TEMP before MAIN */
     if( zDb && sqlite3StrICmp(db->aDb[j].zName, zDb) ) continue;
     pTrigger = sqlite3HashFind(&(db->aDb[j].trigHash), zName, nName+1);
--- sqlite/util.c
+++ sqlite/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.131 2005/03/10 12:35:46 drh Exp $
+** $Id: util.c,v 1.132 2005/03/18 14:03:15 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -858,18 +858,6 @@
   u32 x;
   int n;
   unsigned char c;
-#if 0
-  if( ((c = p[0]) & 0x80)==0 ){
-    *v = c;
-    return 1;
-  }
-  x = c & 0x7f;
-  if( ((c = p[1]) & 0x80)==0 ){
-    *v = (x<<7) | c;
-    return 2;
-  }
-  x = (x<<7) | (c & 0x7f);
-#else
   if( ((signed char*)p)[0]>=0 ){
     *v = p[0];
     return 1;
@@ -880,7 +868,6 @@
     return 2;
   }
   x = (x<<7) | (p[1] & 0x7f);
-#endif
   n = 2;
   do{
     x = (x<<7) | ((c = p[n++])&0x7f);
--- sqlite/vdbe.c
+++ sqlite/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.459 2005/03/17 03:52:48 drh Exp $
+** $Id: vdbe.c,v 1.463 2005/03/29 13:07:00 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -462,6 +462,9 @@
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
   int nProgressOps = 0;      /* Opcodes executed since progress callback. */
 #endif
+#ifndef NDEBUG
+  Mem *pStackLimit;
+#endif
 
   if( p->magic!=VDBE_MAGIC_RUN ) return SQLITE_MISUSE;
   assert( db->magic==SQLITE_MAGIC_BUSY );
@@ -479,6 +482,7 @@
   for(pc=p->pc; rc==SQLITE_OK; pc++){
     assert( pc>=0 && pc<p->nOp );
     assert( pTos<=&p->aStack[pc] );
+    if( sqlite3_malloc_failed ) goto no_mem;
 #ifdef VDBE_PROFILE
     origPc = pc;
     start = hwtime();
@@ -532,6 +536,23 @@
     }
 #endif
 
+#ifndef NDEBUG
+    /* This is to check that the return value of static function
+    ** opcodeNoPush() (see vdbeaux.c) returns values that match the
+    ** implementation of the virtual machine in this file. If
+    ** opcodeNoPush() returns non-zero, then the stack is guarenteed
+    ** not to grow when the opcode is executed. If it returns zero, then
+    ** the stack may grow by at most 1.
+    **
+    ** The global wrapper function sqlite3VdbeOpcodeUsesStack() is not 
+    ** available if NDEBUG is defined at build time.
+    */ 
+    pStackLimit = pTos;
+    if( !sqlite3VdbeOpcodeNoPush(pOp->opcode) ){
+      pStackLimit++;
+    }
+#endif
+
     switch( pOp->opcode ){
 
 /*****************************************************************************
@@ -552,6 +573,11 @@
 ** case statement is followed by a comment of the form "/# same as ... #/"
 ** that comment is used to determine the particular value of the opcode.
 **
+** If a comment on the same line as the "case OP_" construction contains
+** the word "no-push", then the opcode is guarenteed not to grow the 
+** vdbe stack when it is executed. See function opcode() in
+** vdbeaux.c for details.
+**
 ** Documentation about VDBE opcodes is generated by scanning this file
 ** for lines of that contain "Opcode:".  That line and all subsequent
 ** comment lines are used in the generation of the opcode.html documentation
@@ -571,7 +597,7 @@
 ** the one at index P2 from the beginning of
 ** the program.
 */
-case OP_Goto: {
+case OP_Goto: {             /* no-push */
   CHECK_FOR_INTERRUPT;
   pc = pOp->p2 - 1;
   break;
@@ -587,7 +613,7 @@
 ** the return address stack will fill up and processing will abort
 ** with a fatal error.
 */
-case OP_Gosub: {
+case OP_Gosub: {            /* no-push */
   assert( p->returnDepth<sizeof(p->returnStack)/sizeof(p->returnStack[0]) );
   p->returnStack[p->returnDepth++] = pc+1;
   pc = pOp->p2 - 1;
@@ -600,7 +626,7 @@
 ** OP_Gosub.  If an OP_Return has occurred for all OP_Gosubs, then
 ** processing aborts with a fatal error.
 */
-case OP_Return: {
+case OP_Return: {           /* no-push */
   assert( p->returnDepth>0 );
   p->returnDepth--;
   pc = p->returnStack[p->returnDepth] - 1;
@@ -624,7 +650,7 @@
 ** every program.  So a jump past the last instruction of the program
 ** is the same as executing Halt.
 */
-case OP_Halt: {
+case OP_Halt: {            /* no-push */
   p->pTos = pTos;
   p->rc = pOp->p1;
   p->pc = pc;
@@ -670,7 +696,7 @@
 **
 ** The string value P3 is converted to a real and pushed on to the stack.
 */
-case OP_Real: {            /* same as TK_FLOAT */
+case OP_Real: {            /* same as TK_FLOAT, */
   pTos++;
   pTos->flags = MEM_Str|MEM_Static|MEM_Term;
   pTos->z = pOp->p3;
@@ -806,7 +832,7 @@
 **
 ** P1 elements are popped off of the top of stack and discarded.
 */
-case OP_Pop: {
+case OP_Pop: {            /* no-push */
   assert( pOp->p1>=0 );
   popStack(&pTos, pOp->p1);
   assert( pTos>=&p->aStack[-1] );
@@ -849,7 +875,7 @@
 **
 ** See also the Dup instruction.
 */
-case OP_Pull: {
+case OP_Pull: {            /* no-push */
   Mem *pFrom = &pTos[-pOp->p1];
   int i;
   Mem ts;
@@ -881,7 +907,7 @@
 ** stack (P1==0 is the top of the stack) with the value
 ** of the top of the stack.  Then pop the top of the stack.
 */
-case OP_Push: {
+case OP_Push: {            /* no-push */
   Mem *pTo = &pTos[-pOp->p1];
 
   assert( pTo>=p->aStack );
@@ -896,7 +922,7 @@
 ** invoke the callback function using the newly formed array as the
 ** 3rd parameter.
 */
-case OP_Callback: {
+case OP_Callback: {            /* no-push */
   int i;
   assert( p->nResColumn==pOp->p1 );
 
@@ -1032,11 +1058,11 @@
 ** function before the division.  Division by zero returns NULL.
 ** If either operand is NULL, the result is NULL.
 */
-case OP_Add:                   /* same as TK_PLUS */
-case OP_Subtract:              /* same as TK_MINUS */
-case OP_Multiply:              /* same as TK_STAR */
-case OP_Divide:                /* same as TK_SLASH */
-case OP_Remainder: {           /* same as TK_REM */
+case OP_Add:                   /* same as TK_PLUS, no-push */
+case OP_Subtract:              /* same as TK_MINUS, no-push */
+case OP_Multiply:              /* same as TK_STAR, no-push */
+case OP_Divide:                /* same as TK_SLASH, no-push */
+case OP_Remainder: {           /* same as TK_REM, no-push */
   Mem *pNos = &pTos[-1];
   assert( pNos>=p->aStack );
   if( ((pTos->flags | pNos->flags) & MEM_Null)!=0 ){
@@ -1116,7 +1142,7 @@
 ** to retrieve the collation sequence set by this opcode is not available
 ** publicly, only to user functions defined in func.c.
 */
-case OP_CollSeq: {
+case OP_CollSeq: {             /* no-push */
   assert( pOp->p3type==P3_COLLSEQ );
   break;
 }
@@ -1234,10 +1260,10 @@
 ** right by N bits where N is the top element on the stack.
 ** If either operand is NULL, the result is NULL.
 */
-case OP_BitAnd:                 /* same as TK_BITAND */
-case OP_BitOr:                  /* same as TK_BITOR */
-case OP_ShiftLeft:              /* same as TK_LSHIFT */
-case OP_ShiftRight: {           /* same as TK_RSHIFT */
+case OP_BitAnd:                 /* same as TK_BITAND, no-push */
+case OP_BitOr:                  /* same as TK_BITOR, no-push */
+case OP_ShiftLeft:              /* same as TK_LSHIFT, no-push */
+case OP_ShiftRight: {           /* same as TK_RSHIFT, no-push */
   Mem *pNos = &pTos[-1];
   int a, b;
 
@@ -1272,7 +1298,7 @@
 **
 ** To force the top of the stack to be an integer, just add 0.
 */
-case OP_AddImm: {
+case OP_AddImm: {            /* no-push */
   assert( pTos>=p->aStack );
   Integerify(pTos);
   pTos->i += pOp->p1;
@@ -1289,7 +1315,7 @@
 ** current value if P1==0, or to the least integer that is strictly
 ** greater than its current value if P1==1.
 */
-case OP_ForceInt: {
+case OP_ForceInt: {            /* no-push */
   int v;
   assert( pTos>=p->aStack );
   applyAffinity(pTos, SQLITE_AFF_INTEGER, db->enc);
@@ -1324,7 +1350,7 @@
 ** P1 is 1, then the stack is popped.  In all other cases, the depth
 ** of the stack is unchanged.
 */
-case OP_MustBeInt: {
+case OP_MustBeInt: {            /* no-push */
   assert( pTos>=p->aStack );
   applyAffinity(pTos, SQLITE_AFF_INTEGER, db->enc);
   if( (pTos->flags & MEM_Int)==0 ){
@@ -1399,12 +1425,12 @@
 ** the 2nd element down on the stack is greater than or equal to the
 ** top of the stack.  See the Eq opcode for additional information.
 */
-case OP_Eq:               /* same as TK_EQ */
-case OP_Ne:               /* same as TK_NE */
-case OP_Lt:               /* same as TK_LT */
-case OP_Le:               /* same as TK_LE */
-case OP_Gt:               /* same as TK_GT */
-case OP_Ge: {             /* same as TK_GE */
+case OP_Eq:               /* same as TK_EQ, no-push */
+case OP_Ne:               /* same as TK_NE, no-push */
+case OP_Lt:               /* same as TK_LT, no-push */
+case OP_Le:               /* same as TK_LE, no-push */
+case OP_Gt:               /* same as TK_GT, no-push */
+case OP_Ge: {             /* same as TK_GE, no-push */
   Mem *pNos;
   int flags;
   int res;
@@ -1470,8 +1496,8 @@
 ** two values and push the resulting boolean value back onto the
 ** stack. 
 */
-case OP_And:              /* same as TK_AND */
-case OP_Or: {             /* same as TK_OR */
+case OP_And:              /* same as TK_AND, no-push */
+case OP_Or: {             /* same as TK_OR, no-push */
   Mem *pNos = &pTos[-1];
   int v1, v2;    /* 0==TRUE, 1==FALSE, 2==UNKNOWN or NULL */
 
@@ -1518,7 +1544,7 @@
 ** with its absolute value. If the top of the stack is NULL
 ** its value is unchanged.
 */
-case OP_Negative:              /* same as TK_UMINUS */
+case OP_Negative:              /* same as TK_UMINUS, no-push */
 case OP_AbsValue: {
   assert( pTos>=p->aStack );
   if( pTos->flags & MEM_Real ){
@@ -1551,7 +1577,7 @@
 ** with its complement.  If the top of the stack is NULL its value
 ** is unchanged.
 */
-case OP_Not: {                /* same as TK_NOT */
+case OP_Not: {                /* same as TK_NOT, no-push */
   assert( pTos>=p->aStack );
   if( pTos->flags & MEM_Null ) break;  /* Do nothing to NULLs */
   Integerify(pTos);
@@ -1567,7 +1593,7 @@
 ** with its ones-complement.  If the top of the stack is NULL its
 ** value is unchanged.
 */
-case OP_BitNot: {             /* same as TK_BITNOT */
+case OP_BitNot: {             /* same as TK_BITNOT, no-push */
   assert( pTos>=p->aStack );
   if( pTos->flags & MEM_Null ) break;  /* Do nothing to NULLs */
   Integerify(pTos);
@@ -1582,7 +1608,7 @@
 ** Do nothing.  This instruction is often useful as a jump
 ** destination.
 */
-case OP_Noop: {
+case OP_Noop: {            /* no-push */
   break;
 }
 
@@ -1606,8 +1632,8 @@
 ** If the value popped of the stack is NULL, then take the jump if P1
 ** is true and fall through if P1 is false.
 */
-case OP_If:
-case OP_IfNot: {
+case OP_If:                 /* no-push */
+case OP_IfNot: {            /* no-push */
   int c;
   assert( pTos>=p->aStack );
   if( pTos->flags & MEM_Null ){
@@ -1628,7 +1654,7 @@
 ** to P2.  Pop the stack P1 times if P1>0.   If P1<0 leave the stack
 ** unchanged.
 */
-case OP_IsNull: {            /* same as TK_ISNULL */
+case OP_IsNull: {            /* same as TK_ISNULL, no-push */
   int i, cnt;
   Mem *pTerm;
   cnt = pOp->p1;
@@ -1651,7 +1677,7 @@
 ** stack if P1 times if P1 is greater than zero.  If P1 is less than
 ** zero then leave the stack unchanged.
 */
-case OP_NotNull: {            /* same as TK_NOTNULL */
+case OP_NotNull: {            /* same as TK_NOTNULL, no-push */
   int i, cnt;
   cnt = pOp->p1;
   if( cnt<0 ) cnt = -cnt;
@@ -1672,7 +1698,7 @@
 ** If OP_KeyAsData is to be applied to cursor P1, it must be executed
 ** before this op-code.
 */
-case OP_SetNumColumns: {
+case OP_SetNumColumns: {       /* no-push */
   Cursor *pC;
   assert( (pOp->p1)<p->nCursor );
   assert( p->apCsr[pOp->p1]!=0 );
@@ -2130,7 +2156,7 @@
 ** database file has an index of 0 and the file used for temporary tables
 ** has an index of 1.
 */
-case OP_Statement: {
+case OP_Statement: {       /* no-push */
   int i = pOp->p1;
   Btree *pBt;
   if( i>=0 && i<db->nDb && (pBt = db->aDb[i].pBt) && !(db->autoCommit) ){
@@ -2150,7 +2176,7 @@
 **
 ** This instruction causes the VM to halt.
 */
-case OP_AutoCommit: {
+case OP_AutoCommit: {       /* no-push */
   u8 i = pOp->p1;
   u8 rollback = pOp->p2;
 
@@ -2211,7 +2237,7 @@
 **
 ** If P2 is zero, then a read-lock is obtained on the database file.
 */
-case OP_Transaction: {
+case OP_Transaction: {       /* no-push */
   int i = pOp->p1;
   Btree *pBt;
 
@@ -2274,7 +2300,7 @@
 **
 ** A transaction must be started before executing this opcode.
 */
-case OP_SetCookie: {
+case OP_SetCookie: {       /* no-push */
   Db *pDb;
   assert( pOp->p2<SQLITE_N_BTREE_META );
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
@@ -2310,7 +2336,7 @@
 ** to be executed (to establish a read lock) before this opcode is
 ** invoked.
 */
-case OP_VerifyCookie: {
+case OP_VerifyCookie: {       /* no-push */
   int iMeta;
   Btree *pBt;
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
@@ -2370,8 +2396,8 @@
 **
 ** See also OpenRead.
 */
-case OP_OpenRead:
-case OP_OpenWrite: {
+case OP_OpenRead:          /* no-push */
+case OP_OpenWrite: {       /* no-push */
   int i = pOp->p1;
   int p2 = pOp->p2;
   int wrFlag;
@@ -2459,7 +2485,7 @@
 ** whereas "Temporary" in the context of CREATE TABLE means for the duration
 ** of the connection to the database.  Same word; different meanings.
 */
-case OP_OpenTemp: {
+case OP_OpenTemp: {       /* no-push */
   int i = pOp->p1;
   Cursor *pCx;
   assert( i>=0 );
@@ -2508,7 +2534,7 @@
 ** A pseudo-table created by this opcode is useful for holding the
 ** NEW or OLD tables in a trigger.
 */
-case OP_OpenPseudo: {
+case OP_OpenPseudo: {       /* no-push */
   int i = pOp->p1;
   Cursor *pCx;
   assert( i>=0 );
@@ -2526,7 +2552,7 @@
 ** Close a cursor previously opened as P1.  If P1 is not
 ** currently open, this instruction is a no-op.
 */
-case OP_Close: {
+case OP_Close: {       /* no-push */
   int i = pOp->p1;
   if( i>=0 && i<p->nCursor ){
     sqlite3VdbeFreeCursor(p->apCsr[i]);
@@ -2575,10 +2601,10 @@
 **
 ** See also: Found, NotFound, Distinct, MoveGt, MoveGe, MoveLt
 */
-case OP_MoveLt:
-case OP_MoveLe:
-case OP_MoveGe:
-case OP_MoveGt: {
+case OP_MoveLt:         /* no-push */
+case OP_MoveLe:         /* no-push */
+case OP_MoveGe:         /* no-push */
+case OP_MoveGt: {       /* no-push */
   int i = pOp->p1;
   Cursor *pC;
 
@@ -2687,9 +2713,9 @@
 **
 ** See also: Distinct, Found, MoveTo, NotExists, IsUnique
 */
-case OP_Distinct:
-case OP_NotFound:
-case OP_Found: {
+case OP_Distinct:       /* no-push */
+case OP_NotFound:       /* no-push */
+case OP_Found: {        /* no-push */
   int i = pOp->p1;
   int alreadyExists = 0;
   Cursor *pC;
@@ -2738,7 +2764,7 @@
 **
 ** See also: Distinct, NotFound, NotExists, Found
 */
-case OP_IsUnique: {
+case OP_IsUnique: {        /* no-push */
   int i = pOp->p1;
   Mem *pNos = &pTos[-1];
   Cursor *pCx;
@@ -2832,7 +2858,7 @@
 **
 ** See also: Distinct, Found, MoveTo, NotFound, IsUnique
 */
-case OP_NotExists: {
+case OP_NotExists: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
   BtCursor *pCrsr;
@@ -3035,8 +3061,8 @@
 **
 ** P1 may not be a pseudo-table opened using the OpenPseudo opcode.
 */
-case OP_PutIntKey:
-case OP_PutStrKey: {
+case OP_PutIntKey:          /* no-push */
+case OP_PutStrKey: {        /* no-push */
   Mem *pNos = &pTos[-1];
   int i = pOp->p1;
   Cursor *pC;
@@ -3130,7 +3156,7 @@
 **
 ** If P1 is a pseudo-table, then this instruction is a no-op.
 */
-case OP_Delete: {
+case OP_Delete: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
   assert( i>=0 && i<p->nCursor );
@@ -3154,7 +3180,7 @@
 ** change counter (returned by subsequent calls to sqlite3_changes())
 ** before it is reset. This is used by trigger programs.
 */
-case OP_ResetCount: {
+case OP_ResetCount: {        /* no-push */
   if( pOp->p1 ){
     sqlite3VdbeSetChanges(db, p->nChange);
   }
@@ -3169,7 +3195,7 @@
 ** data off of the key rather than the data.  This is used for
 ** processing compound selects.
 */
-case OP_KeyAsData: {
+case OP_KeyAsData: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
   assert( i>=0 && i<p->nCursor );
@@ -3345,7 +3371,7 @@
 ** that occur while the cursor is on the null row will always push 
 ** a NULL onto the stack.
 */
-case OP_NullRow: {
+case OP_NullRow: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
 
@@ -3365,7 +3391,7 @@
 ** If P2 is 0 or if the table or index is not empty, fall through
 ** to the following instruction.
 */
-case OP_Last: {
+case OP_Last: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
   BtCursor *pCrsr;
@@ -3396,7 +3422,7 @@
 ** If P2 is 0 or if the table or index is not empty, fall through
 ** to the following instruction.
 */
-case OP_Rewind: {
+case OP_Rewind: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
   BtCursor *pCrsr;
@@ -3436,8 +3462,8 @@
 ** to the following instruction.  But if the cursor backup was successful,
 ** jump immediately to P2.
 */
-case OP_Prev:
-case OP_Next: {
+case OP_Prev:          /* no-push */
+case OP_Next: {        /* no-push */
   Cursor *pC;
   BtCursor *pCrsr;
 
@@ -3478,7 +3504,7 @@
 ** is rolled back.  If P3 is not null, then it becomes part of the
 ** error message returned with the SQLITE_CONSTRAINT.
 */
-case OP_IdxPut: {
+case OP_IdxPut: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
   BtCursor *pCrsr;
@@ -3530,7 +3556,7 @@
 ** The top of the stack is an index key built using the MakeIdxKey opcode.
 ** This opcode removes that entry from the index.
 */
-case OP_IdxDelete: {
+case OP_IdxDelete: {        /* no-push */
   int i = pOp->p1;
   Cursor *pC;
   BtCursor *pCrsr;
@@ -3632,9 +3658,9 @@
 ** an epsilon prior to the comparison.  This makes the opcode work
 ** like IdxLE.
 */
-case OP_IdxLT:
-case OP_IdxGT:
-case OP_IdxGE: {
+case OP_IdxLT:          /* no-push */
+case OP_IdxGT:          /* no-push */
+case OP_IdxGE: {        /* no-push */
   int i= pOp->p1;
   BtCursor *pCrsr;
   Cursor *pC;
@@ -3678,7 +3704,7 @@
 **
 ** The index entry is always popped from the stack.
 */
-case OP_IdxIsNull: {
+case OP_IdxIsNull: {        /* no-push */
   int i = pOp->p1;
   int k, n;
   const char *z;
@@ -3752,7 +3778,7 @@
 **
 ** See also: Destroy
 */
-case OP_Clear: {
+case OP_Clear: {        /* no-push */
   rc = sqlite3BtreeClearTable(db->aDb[pOp->p2].pBt, pOp->p1);
   break;
 }
@@ -3810,7 +3836,7 @@
 ** This opcode invokes the parser to create a new virtual machine,
 ** then runs the new virtual machine.  It is thus a reentrant opcode.
 */
-case OP_ParseSchema: {
+case OP_ParseSchema: {        /* no-push */
   char *zSql;
   int iDb = pOp->p1;
   const char *zMaster;
@@ -3818,7 +3844,7 @@
 
   assert( iDb>=0 && iDb<db->nDb );
   if( !DbHasProperty(db, iDb, DB_SchemaLoaded) ) break;
-  zMaster = iDb==1 ? TEMP_MASTER_NAME : MASTER_NAME;
+  zMaster = SCHEMA_TABLE(iDb);
   initData.db = db;
   initData.pzErrMsg = &p->zErrMsg;
   zSql = sqlite3MPrintf(
@@ -3842,7 +3868,7 @@
 ** is dropped in order to keep the internal representation of the
 ** schema consistent with what is on disk.
 */
-case OP_DropTable: {
+case OP_DropTable: {        /* no-push */
   sqlite3UnlinkAndDeleteTable(db, pOp->p1, pOp->p3);
   break;
 }
@@ -3854,7 +3880,7 @@
 ** is dropped in order to keep the internal representation of the
 ** schema consistent with what is on disk.
 */
-case OP_DropIndex: {
+case OP_DropIndex: {        /* no-push */
   sqlite3UnlinkAndDeleteIndex(db, pOp->p1, pOp->p3);
   break;
 }
@@ -3866,7 +3892,7 @@
 ** is dropped in order to keep the internal representation of the
 ** schema consistent with what is on disk.
 */
-case OP_DropTrigger: {
+case OP_DropTrigger: {        /* no-push */
   sqlite3UnlinkAndDeleteTrigger(db, pOp->p1, pOp->p3);
   break;
 }
@@ -3931,7 +3957,7 @@
 ** Write the integer on the top of the stack
 ** into the temporary storage list.
 */
-case OP_ListWrite: {
+case OP_ListWrite: {        /* no-push */
   Keylist *pKeylist;
   assert( pTos>=p->aStack );
   pKeylist = p->pList;
@@ -3955,7 +3981,7 @@
 **
 ** Rewind the temporary buffer back to the beginning.
 */
-case OP_ListRewind: {
+case OP_ListRewind: {        /* no-push */
   /* What this opcode codes, really, is reverse the order of the
   ** linked list of Keylist structures so that they are read out
   ** in the same order that they were read in. */
@@ -4002,7 +4028,7 @@
 **
 ** Reset the temporary storage buffer so that it holds nothing.
 */
-case OP_ListReset: {
+case OP_ListReset: {        /* no-push */
   if( p->pList ){
     sqlite3VdbeKeylistFree(p->pList);
     p->pList = 0;
@@ -4017,7 +4043,7 @@
 ** AggContextPop opcode.
 ** 
 */
-case OP_AggContextPush: {
+case OP_AggContextPush: {        /* no-push */
   p->pAgg++;
   assert( p->pAgg<&p->apAgg[p->nAgg] );
   break;
@@ -4028,7 +4054,7 @@
 ** Restore the aggregator to the state it was in when AggContextPush
 ** was last called. Any data in the current aggregator is deleted.
 */
-case OP_AggContextPop: {
+case OP_AggContextPop: {        /* no-push */
   p->pAgg--;
   assert( p->pAgg>=p->apAgg );
   break;
@@ -4042,7 +4068,7 @@
 ** opcode. The context stores the last insert row id, the last statement change
 ** count, and the current statement change count.
 */
-case OP_ContextPush: {
+case OP_ContextPush: {        /* no-push */
   int i = p->contextStackTop++;
   Context *pContext;
 
@@ -4067,7 +4093,7 @@
 ** executed. The context stores the last insert row id, the last statement
 ** change count, and the current statement change count.
 */
-case OP_ContextPop: {
+case OP_ContextPop: {        /* no-push */
   Context *pContext = &p->contextStack[--p->contextStackTop];
   assert( p->contextStackTop>=0 );
   db->lastRowid = pContext->lastRowid;
@@ -4084,7 +4110,7 @@
 ** and put them on the sorter.  The key and data should have been
 ** made using the MakeRecord opcode.
 */
-case OP_SortPut: {
+case OP_SortPut: {        /* no-push */
   Mem *pNos = &pTos[-1];
   Sorter *pSorter;
   assert( pNos>=p->aStack );
@@ -4108,7 +4134,7 @@
 ** mergesort.  The P3 argument is a pointer to a KeyInfo structure
 ** that describes the keys to be sorted.
 */
-case OP_Sort: {
+case OP_Sort: {        /* no-push */
   int i;
   KeyInfo *pKeyInfo = (KeyInfo*)pOp->p3;
   Sorter *pElem;
@@ -4170,7 +4196,7 @@
 **
 ** Remove any elements that remain on the sorter.
 */
-case OP_SortReset: {
+case OP_SortReset: {        /* no-push */
   sqlite3VdbeSorterReset(p);
   break;
 }
@@ -4185,7 +4211,7 @@
 ** stack is popped once if P2 is 1.  If P2 is zero, then
 ** the original data remains on the stack.
 */
-case OP_MemStore: {
+case OP_MemStore: {        /* no-push */
   assert( pTos>=p->aStack );
   assert( pOp->p1>=0 && pOp->p1<p->nMem );
   rc = sqlite3VdbeMemMove(&p->aMem[pOp->p1], pTos);
@@ -4224,7 +4250,7 @@
 ** This instruction throws an error if the memory cell is not initially
 ** an integer.
 */
-case OP_MemMax: {
+case OP_MemMax: {        /* no-push */
   int i = pOp->p1;
   Mem *pMem;
   assert( pTos>=p->aStack );
@@ -4248,7 +4274,7 @@
 ** This instruction throws an error if the memory cell is not initially
 ** an integer.
 */
-case OP_MemIncr: {
+case OP_MemIncr: {        /* no-push */
   int i = pOp->p1;
   Mem *pMem;
   assert( i>=0 && i<p->nMem );
@@ -4266,7 +4292,7 @@
 ** If the value of memory cell P1 is 1 or greater, jump to P2. This
 ** opcode assumes that memory cell P1 holds an integer value.
 */
-case OP_IfMemPos: {
+case OP_IfMemPos: {        /* no-push */
   int i = pOp->p1;
   Mem *pMem;
   assert( i>=0 && i<p->nMem );
@@ -4288,7 +4314,7 @@
 ** there is no GROUP BY expression). In this case it is illegal to invoke
 ** OP_AggFocus.
 */
-case OP_AggReset: {
+case OP_AggReset: {        /* no-push */
   assert( !pOp->p3 || pOp->p3type==P3_KEYINFO );
   if( pOp->p1 ){
     rc = sqlite3VdbeAggReset(0, p->pAgg, (KeyInfo *)pOp->p3);
@@ -4312,7 +4338,7 @@
 ** The aggregate will operate out of aggregate column P2.
 ** P3 is a pointer to the FuncDef structure for the function.
 */
-case OP_AggInit: {
+case OP_AggInit: {        /* no-push */
   int i = pOp->p2;
   assert( i>=0 && i<p->pAgg->nMem );
   p->pAgg->apFunc[i] = (FuncDef*)pOp->p3;
@@ -4330,7 +4356,7 @@
 ** Ideally, this index would be another parameter, but there are
 ** no free parameters left.  The integer is popped from the stack.
 */
-case OP_AggFunc: {
+case OP_AggFunc: {        /* no-push */
   int n = pOp->p2;
   int i;
   Mem *pMem, *pRec;
@@ -4388,7 +4414,7 @@
 ** zero or more AggNext operations.  You must not execute an AggFocus
 ** in between an AggNext and an AggReset.
 */
-case OP_AggFocus: {
+case OP_AggFocus: {        /* no-push */
   char *zKey;
   int nKey;
   int res;
@@ -4422,7 +4448,7 @@
 ** Move the top of the stack into the P2-th field of the current
 ** aggregate.  String values are duplicated into new memory.
 */
-case OP_AggSet: {
+case OP_AggSet: {        /* no-push */
   AggElem *pFocus;
   int i = pOp->p2;
   pFocus = p->pAgg->pCurrent;
@@ -4487,7 +4513,7 @@
 ** zero or more AggNext operations.  You must not execute an AggFocus
 ** in between an AggNext and an AggReset.
 */
-case OP_AggNext: {
+case OP_AggNext: {        /* no-push */
   int res;
   assert( rc==SQLITE_OK );
   CHECK_FOR_INTERRUPT;
@@ -4548,7 +4574,7 @@
 ** machines to be created and run.  It may not be called from within
 ** a transaction.
 */
-case OP_Vacuum: {
+case OP_Vacuum: {        /* no-push */
   if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse; 
   rc = sqlite3RunVacuum(&p->zErrMsg, db);
   if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
@@ -4564,7 +4590,7 @@
 ** If P1 is 0, then all SQL statements become expired. If P1 is non-zero,
 ** then only the currently executing statement is affected. 
 */
-case OP_Expire: {
+case OP_Expire: {        /* no-push */
   if( !pOp->p1 ){
     sqlite3ExpirePreparedStatements(db);
   }else{
@@ -4591,6 +4617,9 @@
 *****************************************************************************/
     }
 
+    /* Make sure the stack limit was not exceeded */
+    assert( pTos<=pStackLimit );
+
 #ifdef VDBE_PROFILE
     {
       long long elapse = hwtime() - start;
--- sqlite/vdbe.h
+++ sqlite/vdbe.h
@@ -15,7 +15,7 @@
 ** or VDBE.  The VDBE implements an abstract machine that runs a
 ** simple program to access and modify the underlying database.
 **
-** $Id: vdbe.h,v 1.93 2005/03/09 12:26:51 danielk1977 Exp $
+** $Id: vdbe.h,v 1.94 2005/03/23 01:48:48 drh Exp $
 */
 #ifndef _SQLITE_VDBE_H_
 #define _SQLITE_VDBE_H_
@@ -78,7 +78,7 @@
 ** from a single sqliteMalloc().  But no copy is made and the calling
 ** function should *not* try to free the KeyInfo.
 */
-#define P3_KEYINFO_HANDOFF (-7)
+#define P3_KEYINFO_HANDOFF (-9)
 
 /*
 ** The following macro converts a relative address in the p2 field
--- sqlite/vdbeInt.h
+++ sqlite/vdbeInt.h
@@ -406,6 +406,7 @@
 void sqlite3VdbeMemRelease(Mem *p);
 #ifndef NDEBUG
 void sqlite3VdbeMemSanity(Mem*, u8);
+int sqlite3VdbeOpcodeNoPush(u8);
 #endif
 int sqlite3VdbeMemTranslate(Mem*, u8);
 void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf, int nBuf);
--- sqlite/vdbeaux.c
+++ sqlite/vdbeaux.c
@@ -57,10 +57,16 @@
 
 /*
 ** Resize the Vdbe.aOp array so that it contains at least N
+** elements. If the Vdbe is in VDBE_MAGIC_RUN state, then
+** the Vdbe.aOp array will be sized to contain exactly N 
 ** elements.
 */
 static void resizeOpArray(Vdbe *p, int N){
-  if( p->nOpAlloc<N ){
+  if( p->magic==VDBE_MAGIC_RUN ){
+    assert( N==p->nOp );
+    p->nOpAlloc = N;
+    p->aOp = sqliteRealloc(p->aOp, N*sizeof(Op));
+  }else if( p->nOpAlloc<N ){
     int oldSize = p->nOpAlloc;
     p->nOpAlloc = N+100;
     p->aOp = sqliteRealloc(p->aOp, p->nOpAlloc*sizeof(Op));
@@ -161,24 +167,91 @@
 }
 
 /*
+** Return non-zero if opcode 'op' is guarenteed not to push more values
+** onto the VDBE stack than it pops off.
+*/
+static int opcodeNoPush(u8 op){
+  /* The 10 NOPUSH_MASK_n constants are defined in the automatically
+  ** generated header file opcodes.h. Each is a 16-bit bitmask, one
+  ** bit corresponding to each opcode implemented by the virtual
+  ** machine in vdbe.c. The bit is true if the word "no-push" appears
+  ** in a comment on the same line as the "case OP_XXX:" in 
+  ** sqlite3VdbeExec() in vdbe.c.
+  **
+  ** If the bit is true, then the corresponding opcode is guarenteed not
+  ** to grow the stack when it is executed. Otherwise, it may grow the
+  ** stack by at most one entry.
+  **
+  ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 contains
+  ** one bit for opcodes 16 to 31, and so on.
+  **
+  ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h 
+  ** because the file is generated by an awk program. Awk manipulates
+  ** all numbers as floating-point and we don't want to risk a rounding
+  ** error if someone builds with an awk that uses (for example) 32-bit 
+  ** IEEE floats.
+  */ 
+  static u32 masks[5] = {
+    NOPUSH_MASK_0 + (NOPUSH_MASK_1<<16),
+    NOPUSH_MASK_2 + (NOPUSH_MASK_3<<16),
+    NOPUSH_MASK_4 + (NOPUSH_MASK_5<<16),
+    NOPUSH_MASK_6 + (NOPUSH_MASK_7<<16),
+    NOPUSH_MASK_8 + (NOPUSH_MASK_9<<16)
+  };
+  return (masks[op>>5] & (1<<(op&0x1F)));
+}
+
+#ifndef NDEBUG
+int sqlite3VdbeOpcodeNoPush(u8 op){
+  return opcodeNoPush(op);
+}
+#endif
+
+/*
 ** Loop through the program looking for P2 values that are negative.
 ** Each such value is a label.  Resolve the label by setting the P2
 ** value to its correct non-zero value.
 **
 ** This routine is called once after all opcodes have been inserted.
+**
+** Variable *pMaxFuncArgs is set to the maximum value of any P1 argument 
+** to an OP_Function or P2 to an OP_AggFunc opcode. This is used by 
+** sqlite3VdbeMakeReady() to size the Vdbe.apArg[] array.
+**
+** The integer *pMaxStack is set to the maximum number of vdbe stack
+** entries that static analysis reveals this program might need.
 */
-static void resolveP2Values(Vdbe *p){
+static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs, int *pMaxStack){
   int i;
+  int nMaxArgs = 0;
+  int nMaxStack = p->nOp;
   Op *pOp;
   int *aLabel = p->aLabel;
-  if( aLabel==0 ) return;
   for(pOp=p->aOp, i=p->nOp-1; i>=0; i--, pOp++){
+    u8 opcode = pOp->opcode;
+
+    /* Todo: Maybe OP_AggFunc should change to use P1 in the same
+     * way as OP_Function. 
+     */
+    if( opcode==OP_Function ){
+      if( pOp->p1>nMaxArgs ) nMaxArgs = pOp->p1;
+    }else if( opcode==OP_AggFunc ){
+      if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
+    }
+
+    if( opcodeNoPush(opcode) ){
+      nMaxStack--;
+    }
+
     if( pOp->p2>=0 ) continue;
     assert( -1-pOp->p2<p->nLabel );
     pOp->p2 = aLabel[-1-pOp->p2];
   }
   sqliteFree(p->aLabel);
   p->aLabel = 0;
+
+  *pMaxFuncArgs = nMaxArgs;
+  *pMaxStack = nMaxStack;
 }
 
 /*
@@ -273,7 +346,7 @@
   assert( p->magic==VDBE_MAGIC_INIT );
   if( p==0 || p->aOp==0 ){
     if( n==P3_DYNAMIC || n==P3_KEYINFO_HANDOFF ){
-      sqliteFree(zP3);
+      sqliteFree((void*)zP3);
     }
     return;
   }
@@ -603,6 +676,13 @@
   */
   assert( p->nOp>0 );
 
+  /* Set the magic to VDBE_MAGIC_RUN sooner rather than later. This
+   * is because the call to resizeOpArray() below may shrink the
+   * p->aOp[] array to save memory if called when in VDBE_MAGIC_RUN 
+   * state.
+   */
+  p->magic = VDBE_MAGIC_RUN;
+
   /* No instruction ever pushes more than a single element onto the
   ** stack.  And the stack never grows on successive executions of the
   ** same loop.  So the total number of instructions is an upper bound
@@ -611,12 +691,16 @@
   ** Allocation all the stack space we will ever need.
   */
   if( p->aStack==0 ){
-    resolveP2Values(p);
+    int nArg;       /* Maximum number of args passed to a user function. */
+    int nStack;     /* Maximum number of stack entries required */
+    resolveP2Values(p, &nArg, &nStack);
+    resizeOpArray(p, p->nOp);
     assert( nVar>=0 );
-    n = isExplain ? 10 : p->nOp;
+    assert( nStack<p->nOp );
+    nStack = isExplain ? 10 : nStack;
     p->aStack = sqliteMalloc(
-        n*sizeof(p->aStack[0])         /* aStack */
-      + n*sizeof(Mem*)                 /* apArg */
+        nStack*sizeof(p->aStack[0])    /* aStack */
+      + nArg*sizeof(Mem*)              /* apArg */
       + nVar*sizeof(Mem)               /* aVar */
       + nVar*sizeof(char*)             /* azVar */
       + nMem*sizeof(Mem)               /* aMem */
@@ -624,13 +708,13 @@
       + nAgg*sizeof(Agg)               /* Aggregate contexts */
     );
     if( !sqlite3_malloc_failed ){
-      p->aMem = &p->aStack[n];
+      p->aMem = &p->aStack[nStack];
       p->nMem = nMem;
       p->aVar = &p->aMem[nMem];
       p->nVar = nVar;
       p->okVar = 0;
       p->apArg = (Mem**)&p->aVar[nVar];
-      p->azVar = (char**)&p->apArg[n];
+      p->azVar = (char**)&p->apArg[nArg];
       p->apCsr = (Cursor**)&p->azVar[nVar];
       if( nAgg>0 ){
         p->nAgg = nAgg;