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/malloc.c | |
| 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/malloc.c')
| -rw-r--r-- | src/malloc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/malloc.c b/src/malloc.c index 6fb9d53d1..4960f91e0 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -377,11 +377,12 @@ void *sqlite3ScratchMalloc(int n){ #if SQLITE_THREADSAFE==0 && !defined(NDEBUG) - /* Verify that no more than two scratch allocations per thread - ** are outstanding at one time. (This is only checked in the - ** single-threaded case since checking in the multi-threaded case - ** would be much more complicated.) */ - assert( scratchAllocOut<=1 ); + /* EVIDENCE-OF: R-12970-05880 SQLite will not use more than one scratch + ** buffers per thread. + ** + ** This can only be checked in single-threaded mode. + */ + assert( scratchAllocOut==0 ); if( p ) scratchAllocOut++; #endif |