SQLite4
Check-in [b66a99f023]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:merged in [3abadc2e11ef] (approved by drh).
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b66a99f0232b399072ce83e451410157d012b59a
User & Date: stephan 2012-06-29 22:49:35
Context
2012-06-29
23:02
moved Parse::aColCache/yColCache type into ParseYColCache. check-in: ee4cd98515 user: stephan tags: trunk
22:49
merged in [3abadc2e11ef] (approved by drh). check-in: b66a99f023 user: stephan tags: trunk
22:42
"uplifted" sqlite4::init to Sqlite4InitInfo typedef. Closed-Leaf check-in: 3abadc2e11 user: stephan tags: stephan
21:40
"Uplifted" KVFactory::xFactory's type to typedef KVFactory_factory_f. check-in: 995c17a6f1 user: stephan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/sqliteInt.h.

   605    605   typedef struct LookasideSlot LookasideSlot;
   606    606   typedef struct Module Module;
   607    607   typedef struct NameContext NameContext;
   608    608   typedef struct Parse Parse;
   609    609   typedef struct RowSet RowSet;
   610    610   typedef struct Savepoint Savepoint;
   611    611   typedef struct Select Select;
          612  +typedef struct Sqlite4InitInfo Sqlite4InitInfo;
   612    613   typedef struct SrcList SrcList;
   613    614   typedef struct StrAccum StrAccum;
   614    615   typedef struct Table Table;
   615    616   typedef struct Token Token;
   616    617   typedef struct Trigger Trigger;
   617    618   typedef struct TriggerPrg TriggerPrg;
   618    619   typedef struct TriggerStep TriggerStep;
................................................................................
   769    770     LookasideSlot *pFree;   /* List of available buffers */
   770    771     void *pStart;           /* First byte of available memory space */
   771    772     void *pEnd;             /* First byte past end of available space */
   772    773   };
   773    774   struct LookasideSlot {
   774    775     LookasideSlot *pNext;    /* Next buffer in the list of free buffers */
   775    776   };
          777  +
          778  +/*
          779  +** Information used during initialization.
          780  +*/
          781  +struct Sqlite4InitInfo {
          782  +  int iDb;                    /* When back is being initialized */
          783  +  int newTnum;                /* Rootpage of table being initialized */
          784  +  u8 busy;                    /* TRUE if currently initializing */
          785  +  u8 orphanTrigger;           /* Last statement is orphaned TEMP trigger */
          786  +};
          787  +
   776    788   
   777    789   /*
   778    790   ** Each database connection is an instance of the following structure.
   779    791   **
   780    792   ** The sqlite.lastRowid records the last insert rowid generated by an
   781    793   ** insert statement.  Inserts on views do not affect its value.  Each
   782    794   ** trigger has its own context, so that lastRowid can be updated inside
................................................................................
   818    830     CollSeq *pDfltColl;           /* The default collating sequence (BINARY) */
   819    831     i64 lastRowid;                /* ROWID of most recent insert (see above) */
   820    832     u32 magic;                    /* Magic number for detect library misuse */
   821    833     int nChange;                  /* Value returned by sqlite4_changes() */
   822    834     int nTotalChange;             /* Value returned by sqlite4_total_changes() */
   823    835     sqlite4_mutex *mutex;         /* Connection mutex */
   824    836     int aLimit[SQLITE4_N_LIMIT];   /* Limits */
   825         -  struct sqlite4InitInfo {      /* Information used during initialization */
   826         -    int iDb;                    /* When back is being initialized */
   827         -    int newTnum;                /* Rootpage of table being initialized */
   828         -    u8 busy;                    /* TRUE if currently initializing */
   829         -    u8 orphanTrigger;           /* Last statement is orphaned TEMP trigger */
   830         -  } init;
          837  +  Sqlite4InitInfo init;
   831    838     int nExtension;               /* Number of loaded extensions */
   832    839     void **aExtension;            /* Array of shared library handles */
   833    840     struct Vdbe *pVdbe;           /* List of active virtual machines */
   834    841     int activeVdbeCnt;            /* Number of VDBEs currently executing */
   835    842     int writeVdbeCnt;             /* Number of active VDBEs that are writing */
   836    843     int vdbeExecCnt;              /* Number of nested calls to VdbeExec() */
   837    844     void (*xTrace)(void*,const char*);        /* Trace function */