diff options
| author | drh <drh@noemail.net> | 2016-02-05 14:15:34 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-05 14:15:34 +0000 |
| commit | 0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546 (patch) | |
| tree | 1d545d99bb6eac2e377e894a275770afff9b1a3d /src/wherecode.c | |
| parent | 33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9 (diff) | |
| parent | 0539702b8e9a54b2c8cbc28db6666570700fc1c8 (diff) | |
| download | sqlite-0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546.tar.gz sqlite-0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546.zip | |
Merge enhancements from trunk.
FossilOrigin-Name: a533608cb0de3cbc1e28a794aab99864b8c249f4
Diffstat (limited to 'src/wherecode.c')
| -rw-r--r-- | src/wherecode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wherecode.c b/src/wherecode.c index f5f45da39..bb48e5dc7 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -495,9 +495,7 @@ static int codeAllEqualityTerms( pParse->nMem += nReg; zAff = sqlite3DbStrDup(pParse->db,sqlite3IndexAffinityStr(pParse->db,pIdx)); - if( !zAff ){ - pParse->db->mallocFailed = 1; - } + assert( zAff!=0 || pParse->db->mallocFailed ); if( nSkip ){ int iIdxCur = pLevel->iIdxCur; |