diff options
author | drh <drh@noemail.net> | 2011-12-23 00:25:02 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2011-12-23 00:25:02 +0000 |
commit | bec7c97899cc6ff656ea134d2b718909e80c5063 (patch) | |
tree | b70dcf4eb4fe894e56811550373fb848703323f3 /src/malloc.c | |
parent | 3a7df358ab0518f0b4057093a901896dd66d5250 (diff) | |
parent | 9291372094ec5dfa66fb9ca67171a7d9c7b4ceba (diff) | |
download | sqlite-bec7c97899cc6ff656ea134d2b718909e80c5063.tar.gz sqlite-bec7c97899cc6ff656ea134d2b718909e80c5063.zip |
Merge the latest trunk changes into the statvfs branch.
FossilOrigin-Name: d5e36327c12f264429eb079bddbb71a310f76389
Diffstat (limited to 'src/malloc.c')
-rw-r--r-- | src/malloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/malloc.c b/src/malloc.c index 3e38d1df9..29c6b0dcd 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -130,7 +130,8 @@ sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 n){ sqlite3_int64 priorLimit; sqlite3_int64 excess; #ifndef SQLITE_OMIT_AUTOINIT - sqlite3_initialize(); + int rc = sqlite3_initialize(); + if( rc ) return -1; #endif sqlite3_mutex_enter(mem0.mutex); priorLimit = mem0.alarmThreshold; |