diff options
| author | drh <drh@noemail.net> | 2006-01-11 21:41:20 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2006-01-11 21:41:20 +0000 |
| commit | 6f7adc8a8036ec2d30ba4cd12610e0cba5834640 (patch) | |
| tree | da5457aef1a8cb9194acffdf80b19f512aea3823 /src/callback.c | |
| parent | 0203bde908cb15eecef3a03c9761827e165d71db (diff) | |
| download | sqlite-6f7adc8a8036ec2d30ba4cd12610e0cba5834640.tar.gz sqlite-6f7adc8a8036ec2d30ba4cd12610e0cba5834640.zip | |
Automatically deallocate thread-specific data when it is no longer
being used. Ticket #1601. Also implemented the suggestion of
ticket #1603. Memory management is now off by default at compile-time.
The sqlite3_enable_memory_management() API has been removed. (CVS 2919)
FossilOrigin-Name: 5d9c6aa964305c3f36741ff0058da5b5f3ce0d24
Diffstat (limited to 'src/callback.c')
| -rw-r--r-- | src/callback.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/callback.c b/src/callback.c index a1bf57789..c63b588aa 100644 --- a/src/callback.c +++ b/src/callback.c @@ -13,7 +13,7 @@ ** This file contains functions used to access the internal hash tables ** of user defined functions and collation sequences. ** -** $Id: callback.c,v 1.10 2006/01/10 17:58:23 danielk1977 Exp $ +** $Id: callback.c,v 1.11 2006/01/11 21:41:22 drh Exp $ */ #include "sqliteInt.h" @@ -178,7 +178,8 @@ static CollSeq *findCollSeqEntry( ** return the pColl pointer to be deleted (because it wasn't added ** to the hash table). */ - assert( !pDel || (sqlite3ThreadData()->mallocFailed && pDel==pColl) ); + assert( !pDel || + (sqlite3ThreadDataReadOnly()->mallocFailed && pDel==pColl) ); sqliteFree(pDel); } } |