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/utf.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/utf.c')
| -rw-r--r-- | src/utf.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -231,7 +231,7 @@ SQLITE_NOINLINE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ rc = sqlite3VdbeMemMakeWriteable(pMem); if( rc!=SQLITE_OK ){ assert( rc==SQLITE_NOMEM ); - return SQLITE_NOMEM; + return SQLITE_NOMEM_BKPT; } zIn = (u8*)pMem->z; zTerm = &zIn[pMem->n&~1]; @@ -273,7 +273,7 @@ SQLITE_NOINLINE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ zTerm = &zIn[pMem->n]; zOut = sqlite3DbMallocRaw(pMem->db, len); if( !zOut ){ - return SQLITE_NOMEM; + return SQLITE_NOMEM_BKPT; } z = zOut; |