Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a harmless compiler warning. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | experimental |
Files: | files | file ages | folders |
SHA1: |
d7f6837e6997a4d5c0fd2d08b52887d6 |
User & Date: | drh 2014-03-03 15:13:27.429 |
Context
2014-03-03
| ||
17:48 | Merge latest trunk changes. (check-in: 1d60356462 user: dan tags: experimental) | |
15:13 | Fix a harmless compiler warning. (check-in: d7f6837e69 user: drh tags: experimental) | |
14:45 | Merge latest trunk changes. (check-in: e00ed717fb user: dan tags: experimental) | |
Changes
Changes to src/vdbeaux.c.
︙ | ︙ | |||
3495 3496 3497 3498 3499 3500 3501 | mem1.n = (serial_type - 12) / 2; if( (d1+mem1.n) > nKey1 ){ rc = 1; /* Corruption */ }else if( pKeyInfo->aColl[i] ){ mem1.enc = pKeyInfo->enc; mem1.db = pKeyInfo->db; mem1.flags = MEM_Str; | | | 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 | mem1.n = (serial_type - 12) / 2; if( (d1+mem1.n) > nKey1 ){ rc = 1; /* Corruption */ }else if( pKeyInfo->aColl[i] ){ mem1.enc = pKeyInfo->enc; mem1.db = pKeyInfo->db; mem1.flags = MEM_Str; mem1.z = (char*)&aKey1[d1]; rc = vdbeCompareMemString(&mem1, pRhs, pKeyInfo->aColl[i]); }else{ int nCmp = MIN(mem1.n, pRhs->n); rc = memcmp(&aKey1[d1], pRhs->z, nCmp); if( rc==0 ) rc = mem1.n - pRhs->n; } } |
︙ | ︙ |