diff options
| author | drh <drh@noemail.net> | 2016-02-25 18:54:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-25 18:54:30 +0000 |
| commit | d3e1af4aa04113b379050119e0015ada3078cc4e (patch) | |
| tree | d12ed8d1907415a474cf321b76498befd1312fc9 /src/malloc.c | |
| parent | 7f219fad58bb84f5e856134a7b6909c8c0482c9b (diff) | |
| parent | eecb80e77e3556e9373237eff6ab0a8dad7eb5fb (diff) | |
| download | sqlite-d3e1af4aa04113b379050119e0015ada3078cc4e.tar.gz sqlite-d3e1af4aa04113b379050119e0015ada3078cc4e.zip | |
Merge all the latest changes from trunk.
FossilOrigin-Name: b86590043e17705ada90562cf30f69b3e3ef65a4
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/malloc.c b/src/malloc.c index ebe044035..462d78e68 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -795,7 +795,7 @@ void sqlite3OomClear(sqlite3 *db){ static SQLITE_NOINLINE int apiOomError(sqlite3 *db){ sqlite3OomClear(db); sqlite3Error(db, SQLITE_NOMEM); - return SQLITE_NOMEM; + return SQLITE_NOMEM_BKPT; } /* |