diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/vdbemem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vdbemem.c b/src/vdbemem.c index 7a736fc21..cb44f3ab2 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -204,13 +204,13 @@ int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ assert( !sqlite3VdbeMemIsRowSet(pMem) ); assert( desiredEnc==SQLITE_UTF8 || desiredEnc==SQLITE_UTF16LE || desiredEnc==SQLITE_UTF16BE ); - if( pMem->enc==desiredEnc ){ - return SQLITE_OK; - } if( !(pMem->flags&MEM_Str) ){ pMem->enc = desiredEnc; return SQLITE_OK; } + if( pMem->enc==desiredEnc ){ + return SQLITE_OK; + } assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) ); #ifdef SQLITE_OMIT_UTF16 return SQLITE_ERROR; |