diff options
| author | drh <drh@noemail.net> | 2014-10-10 12:56:35 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-10-10 12:56:35 +0000 |
| commit | 78aad7cd1d026afa649460cf0ed6508c3d88a16e (patch) | |
| tree | c66b7fbf71eff102ec90e35f39473d86e85c8425 /src/sqliteInt.h | |
| parent | 595db25b2890e493e978796a439f66925d8a1e3d (diff) | |
| parent | 6e1a03735790e1ccf2f243d26197090e7954b9fc (diff) | |
| download | sqlite-78aad7cd1d026afa649460cf0ed6508c3d88a16e.tar.gz sqlite-78aad7cd1d026afa649460cf0ed6508c3d88a16e.zip | |
Merge all recent trunk changes.
FossilOrigin-Name: abfef254721ca29b653f24bfe80e88adaa92dc6c
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 318629832..02ae089b1 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1809,6 +1809,7 @@ struct Index { int nSampleCol; /* Size of IndexSample.anEq[] and so on */ tRowcnt *aAvgEq; /* Average nEq values for keys not in aSample */ IndexSample *aSample; /* Samples of the left-most key */ + tRowcnt *aiRowEst; /* Non-logarithmic stat1 data for this table */ #endif }; @@ -3811,10 +3812,9 @@ SQLITE_EXTERN void (*sqlite3IoTrace)(const char*,...); # define sqlite3MemdebugNoType(X,Y) 1 #endif #define MEMTYPE_HEAP 0x01 /* General heap allocations */ -#define MEMTYPE_LOOKASIDE 0x02 /* Might have been lookaside memory */ +#define MEMTYPE_LOOKASIDE 0x02 /* Heap that might have been lookaside */ #define MEMTYPE_SCRATCH 0x04 /* Scratch allocations */ #define MEMTYPE_PCACHE 0x08 /* Page cache allocations */ -#define MEMTYPE_DB 0x10 /* Uses sqlite3DbMalloc, not sqlite_malloc */ /* ** Threading interface |