| Index: third_party/sqlite/src/src/utf.c
|
| diff --git a/third_party/sqlite/src/src/utf.c b/third_party/sqlite/src/src/utf.c
|
| index ee367c139977f74125ecdf9c19b19813ac4ff61a..7801306cb48d6dc6fd6dc0b5b045f1f3e24db8e6 100644
|
| --- a/third_party/sqlite/src/src/utf.c
|
| +++ b/third_party/sqlite/src/src/utf.c
|
| @@ -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;
|
|
|
| @@ -316,7 +316,7 @@ SQLITE_NOINLINE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){
|
|
|
| c = pMem->flags;
|
| sqlite3VdbeMemRelease(pMem);
|
| - pMem->flags = MEM_Str|MEM_Term|(c&MEM_AffMask);
|
| + pMem->flags = MEM_Str|MEM_Term|(c&(MEM_AffMask|MEM_Subtype));
|
| pMem->enc = desiredEnc;
|
| pMem->z = (char*)zOut;
|
| pMem->zMalloc = pMem->z;
|
|
|