diff options
| author | drh <drh@noemail.net> | 2014-11-18 21:20:57 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-11-18 21:20:57 +0000 |
| commit | 04e8a5866948996e4dd1540a9a736d00609c27e8 (patch) | |
| tree | fcf53188c46e77ce3d90818bc17e118298813b18 /src/sqliteInt.h | |
| parent | ca3e10ea37c4808fa84063f06b02229801b28cc0 (diff) | |
| parent | 64b600ff13d4bac1d459cf54b649b45e520aba4c (diff) | |
| download | sqlite-04e8a5866948996e4dd1540a9a736d00609c27e8.tar.gz sqlite-04e8a5866948996e4dd1540a9a736d00609c27e8.zip | |
Merge recent trunk enhancements, including the read-after-ROLLBACK change
and the addition of sqlite3_stmt_scanstatus() support, as well as various
minor bug fixes.
FossilOrigin-Name: f09055f3c4348264c7336f90646375f0d98b061e
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index b3801160d..3a308118b 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -193,10 +193,9 @@ #endif /* -** The SQLITE_DEFAULT_MEMSTATUS macro must be defined as either 0 or 1. -** It determines whether or not the features related to -** SQLITE_CONFIG_MEMSTATUS are available by default or not. This value can -** be overridden at runtime using the sqlite3_config() API. +** EVIDENCE-OF: R-25715-37072 Memory allocation statistics are enabled by +** default unless SQLite is compiled with SQLITE_DEFAULT_MEMSTATUS=0 in +** which case memory allocation statistics are disabled by default. */ #if !defined(SQLITE_DEFAULT_MEMSTATUS) # define SQLITE_DEFAULT_MEMSTATUS 1 @@ -563,7 +562,7 @@ typedef INT8_TYPE i8; /* 1-byte signed integer */ ** gives a possible range of values of approximately 1.0e986 to 1e-986. ** But the allowed values are "grainy". Not every value is representable. ** For example, quantities 16 and 17 are both represented by a LogEst -** of 40. However, since LogEst quantaties are suppose to be estimates, +** of 40. However, since LogEst quantities are suppose to be estimates, ** not exact values, this imprecision is not a problem. ** ** "LogEst" is short for "Logarithmic Estimate". |