diff options
| author | drh <drh@noemail.net> | 2016-01-01 13:25:06 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-01-01 13:25:06 +0000 |
| commit | 8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b (patch) | |
| tree | b2968afbe57bd3f1d1305f5a2241f575cca3b909 /src/vdbeaux.c | |
| parent | 173b60999eb7b2fda450df311e286539fcd2b854 (diff) | |
| parent | a660caf2f01c99ef48085c731e200b5a2fa575b5 (diff) | |
| download | sqlite-8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b.tar.gz sqlite-8de1d77c60af1fbac5cc7eb7eb84efa3e43a320b.zip | |
Merge the latest enhancements from trunk.
FossilOrigin-Name: c0be246a740c8f33a7c07e1414688364dee56ece
Diffstat (limited to 'src/vdbeaux.c')
| -rw-r--r-- | src/vdbeaux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 68a617bfd..5a23062ad 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -3750,7 +3750,7 @@ int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const CollSeq *pColl){ return -1; } - assert( pMem1->enc==pMem2->enc ); + assert( pMem1->enc==pMem2->enc || pMem1->db->mallocFailed ); assert( pMem1->enc==SQLITE_UTF8 || pMem1->enc==SQLITE_UTF16LE || pMem1->enc==SQLITE_UTF16BE ); |