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/backup.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/backup.c')
| -rw-r--r-- | src/backup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backup.c b/src/backup.c index 1c282242d..455671a1a 100644 --- a/src/backup.c +++ b/src/backup.c @@ -88,7 +88,7 @@ static Btree *findBtree(sqlite3 *pErrorDb, sqlite3 *pDb, const char *zDb){ pParse = sqlite3StackAllocZero(pErrorDb, sizeof(*pParse)); if( pParse==0 ){ sqlite3ErrorWithMsg(pErrorDb, SQLITE_NOMEM, "out of memory"); - rc = SQLITE_NOMEM; + rc = SQLITE_NOMEM_BKPT; }else{ pParse->db = pDb; if( sqlite3OpenTempDatabase(pParse) ){ @@ -182,7 +182,7 @@ sqlite3_backup *sqlite3_backup_init( ** sqlite3_backup_finish(). */ p = (sqlite3_backup *)sqlite3MallocZero(sizeof(sqlite3_backup)); if( !p ){ - sqlite3Error(pDestDb, SQLITE_NOMEM); + sqlite3Error(pDestDb, SQLITE_NOMEM_BKPT); } } @@ -581,7 +581,7 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){ } if( rc==SQLITE_IOERR_NOMEM ){ - rc = SQLITE_NOMEM; + rc = SQLITE_NOMEM_BKPT; } p->rc = rc; } |