Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch stephan Excluding Merge-Ins
This is equivalent to a diff from 995c17a6f1 to 3abadc2e11
|
2012-06-29
| ||
| 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 | |
| 21:38 | va_arg function ptr conversion changed to a typedef for portability (tcc). The tcc guys claim (with references) that the syntax fault is sqlite's here. check-in: db19977f62 user: stephan tags: trunk | |
Changes to src/sqliteInt.h.
| ︙ | ︙ | |||
605 606 607 608 609 610 611 612 613 614 615 616 617 618 | typedef struct LookasideSlot LookasideSlot; typedef struct Module Module; typedef struct NameContext NameContext; typedef struct Parse Parse; typedef struct RowSet RowSet; typedef struct Savepoint Savepoint; typedef struct Select Select; typedef struct SrcList SrcList; typedef struct StrAccum StrAccum; typedef struct Table Table; typedef struct Token Token; typedef struct Trigger Trigger; typedef struct TriggerPrg TriggerPrg; typedef struct TriggerStep TriggerStep; | > | 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | typedef struct LookasideSlot LookasideSlot; typedef struct Module Module; typedef struct NameContext NameContext; typedef struct Parse Parse; typedef struct RowSet RowSet; typedef struct Savepoint Savepoint; typedef struct Select Select; typedef struct Sqlite4InitInfo Sqlite4InitInfo; typedef struct SrcList SrcList; typedef struct StrAccum StrAccum; typedef struct Table Table; typedef struct Token Token; typedef struct Trigger Trigger; typedef struct TriggerPrg TriggerPrg; typedef struct TriggerStep TriggerStep; |
| ︙ | ︙ | |||
769 770 771 772 773 774 775 776 777 778 779 780 781 782 |
LookasideSlot *pFree; /* List of available buffers */
void *pStart; /* First byte of available memory space */
void *pEnd; /* First byte past end of available space */
};
struct LookasideSlot {
LookasideSlot *pNext; /* Next buffer in the list of free buffers */
};
/*
** Each database connection is an instance of the following structure.
**
** The sqlite.lastRowid records the last insert rowid generated by an
** insert statement. Inserts on views do not affect its value. Each
** trigger has its own context, so that lastRowid can be updated inside
| > > > > > > > > > > > | 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 |
LookasideSlot *pFree; /* List of available buffers */
void *pStart; /* First byte of available memory space */
void *pEnd; /* First byte past end of available space */
};
struct LookasideSlot {
LookasideSlot *pNext; /* Next buffer in the list of free buffers */
};
/*
** Information used during initialization.
*/
struct Sqlite4InitInfo {
int iDb; /* When back is being initialized */
int newTnum; /* Rootpage of table being initialized */
u8 busy; /* TRUE if currently initializing */
u8 orphanTrigger; /* Last statement is orphaned TEMP trigger */
};
/*
** Each database connection is an instance of the following structure.
**
** The sqlite.lastRowid records the last insert rowid generated by an
** insert statement. Inserts on views do not affect its value. Each
** trigger has its own context, so that lastRowid can be updated inside
|
| ︙ | ︙ | |||
818 819 820 821 822 823 824 | CollSeq *pDfltColl; /* The default collating sequence (BINARY) */ i64 lastRowid; /* ROWID of most recent insert (see above) */ u32 magic; /* Magic number for detect library misuse */ int nChange; /* Value returned by sqlite4_changes() */ int nTotalChange; /* Value returned by sqlite4_total_changes() */ sqlite4_mutex *mutex; /* Connection mutex */ int aLimit[SQLITE4_N_LIMIT]; /* Limits */ | < < < < < | | 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 | CollSeq *pDfltColl; /* The default collating sequence (BINARY) */ i64 lastRowid; /* ROWID of most recent insert (see above) */ u32 magic; /* Magic number for detect library misuse */ int nChange; /* Value returned by sqlite4_changes() */ int nTotalChange; /* Value returned by sqlite4_total_changes() */ sqlite4_mutex *mutex; /* Connection mutex */ int aLimit[SQLITE4_N_LIMIT]; /* Limits */ Sqlite4InitInfo init; int nExtension; /* Number of loaded extensions */ void **aExtension; /* Array of shared library handles */ struct Vdbe *pVdbe; /* List of active virtual machines */ int activeVdbeCnt; /* Number of VDBEs currently executing */ int writeVdbeCnt; /* Number of active VDBEs that are writing */ int vdbeExecCnt; /* Number of nested calls to VdbeExec() */ void (*xTrace)(void*,const char*); /* Trace function */ |
| ︙ | ︙ |