Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Remove an incorrect ALWAYS() macro. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
f7a74f89dbd58b47bbcb58ea2af71fbe |
User & Date: | drh 2019-11-10 10:08:03.079 |
References
2020-07-13
| ||
15:35 | Add back the ALWAYS() macro that was removed by [f7a74f89dbd58b47] as the condition is no longer reachable due to the previous check-in. (check-in: 9cb03beae4 user: drh tags: trunk) | |
Context
2019-11-10
| ||
11:09 | Proper surrogate pair decoding added to JSON functions. See the mailing list bug report and [https://bugs.python.org/issue38749]. More test cases needed here, but it seems to work so far. (check-in: 51027f08c0 user: drh tags: trunk) | |
10:08 | Remove an incorrect ALWAYS() macro. (check-in: f7a74f89db user: drh tags: trunk) | |
2019-11-09
| ||
15:31 | Change the COLFLAG_NOTAVAIL bitmask so that it fits in the single-byte Walker.eCode field. (check-in: 53847f5c28 user: drh tags: trunk) | |
Changes
Changes to src/expr.c.
︙ | ︙ | |||
186 187 188 189 190 191 192 | if( p->flags & EP_Collate ){ if( p->pLeft && (p->pLeft->flags & EP_Collate)!=0 ){ p = p->pLeft; }else{ Expr *pNext = p->pRight; /* The Expr.x union is never used at the same time as Expr.pRight */ assert( p->x.pList==0 || p->pRight==0 ); | < < < | | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 | if( p->flags & EP_Collate ){ if( p->pLeft && (p->pLeft->flags & EP_Collate)!=0 ){ p = p->pLeft; }else{ Expr *pNext = p->pRight; /* The Expr.x union is never used at the same time as Expr.pRight */ assert( p->x.pList==0 || p->pRight==0 ); if( p->x.pList!=0 && !db->mallocFailed && ALWAYS(!ExprHasProperty(p, EP_xIsSelect)) ){ int i; for(i=0; i<p->x.pList->nExpr; i++){ if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){ pNext = p->x.pList->a[i].pExpr; break; } } } p = pNext; |
︙ | ︙ |