1.1 --- a/extensions/sqlite/sqlite-source/vdbeInt.h	Sun Oct 28 05:06:12 2007 +0000
     1.2 +++ b/extensions/sqlite/sqlite-source/vdbeInt.h	Sun Oct 28 05:48:06 2007 +0000
     1.3 @@ -25,13 +25,6 @@
     1.4  #define keyToInt(X)   (X)
     1.5  #define intToKey(X)   (X)
     1.6  
     1.7 -/*
     1.8 -** The makefile scans the vdbe.c source file and creates the following
     1.9 -** array of string constants which are the names of all VDBE opcodes.  This
    1.10 -** array is defined in a separate source code file named opcode.c which is
    1.11 -** automatically generated by the makefile.
    1.12 -*/
    1.13 -extern const char *const sqlite3OpcodeNames[];
    1.14  
    1.15  /*
    1.16  ** SQL is translated into a sequence of instructions to be
    1.17 @@ -130,6 +123,7 @@
    1.18      FuncDef *pDef;      /* Used only when flags==MEM_Agg */
    1.19    } u;
    1.20    double r;           /* Real value */
    1.21 +  sqlite3 *db;        /* The associated database connection */
    1.22    char *z;            /* String or BLOB value */
    1.23    int n;              /* Number of characters in string value, including '\0' */
    1.24    u16 flags;          /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */
    1.25 @@ -323,7 +317,7 @@
    1.26    unsigned uniqueCnt;     /* Used by OP_MakeRecord when P2!=0 */
    1.27    int errorAction;        /* Recovery action to do in case of an error */
    1.28    int inTempTrans;        /* True if temp database is transactioned */
    1.29 -  int returnStack[100];   /* Return address stack for OP_Gosub & OP_Return */
    1.30 +  int returnStack[25];    /* Return address stack for OP_Gosub & OP_Return */
    1.31    int returnDepth;        /* Next unused element in returnStack[] */
    1.32    int nResColumn;         /* Number of columns in one row of the result set */
    1.33    char **azResColumn;     /* Values for one row of result */ 
    1.34 @@ -338,6 +332,8 @@
    1.35    u8 inVtabMethod;        /* See comments above */
    1.36    int nChange;            /* Number of db changes made since last reset */
    1.37    i64 startTime;          /* Time when query started - used for profiling */
    1.38 +  int btreeMask;          /* Bitmask of db->aDb[] entries referenced */
    1.39 +  BtreeMutexArray aMutex; /* An array of Btree used here and needing locks */
    1.40    int nSql;             /* Number of bytes in zSql */
    1.41    char *zSql;           /* Text of the SQL statement that generated this */
    1.42  #ifdef SQLITE_DEBUG
    1.43 @@ -374,7 +370,7 @@
    1.44  void sqlite3VdbeDeleteAuxData(VdbeFunc*, int);
    1.45  
    1.46  int sqlite2BtreeKeyCompare(BtCursor *, const void *, int, int, int *);
    1.47 -int sqlite3VdbeIdxKeyCompare(Cursor*, int , const unsigned char*, int*);
    1.48 +int sqlite3VdbeIdxKeyCompare(Cursor*,int,const unsigned char*,int*);
    1.49  int sqlite3VdbeIdxRowid(BtCursor *, i64 *);
    1.50  int sqlite3MemCompare(const Mem*, const Mem*, const CollSeq*);
    1.51  int sqlite3VdbeRecordCompare(void*,int,const void*,int, const void*);
    1.52 @@ -405,6 +401,8 @@
    1.53  int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*);
    1.54  void sqlite3VdbeMemRelease(Mem *p);
    1.55  int sqlite3VdbeMemFinalize(Mem*, FuncDef*);
    1.56 +const char *sqlite3OpcodeName(int);
    1.57 +
    1.58  #ifndef NDEBUG
    1.59    void sqlite3VdbeMemSanity(Mem*);
    1.60    int sqlite3VdbeOpcodeNoPush(u8);