Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge in the R-tree fix from the trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | apple-osx |
| Files: | files | file ages | folders |
| SHA1: |
02ee0bd5a305e3a6cd76f2e304f8a7ef |
| User & Date: | drh 2010-08-24 01:51:07 |
Context
|
2010-09-09
| ||
| 23:31 | The merge for check-in [415c448dc4] did not do exactly write, resulting in a subtle bug in the SQLITE_FCNTL_SIZE_HINT logic. This check-in is the fix. (check-in: badaaa18 user: drh tags: apple-osx) | |
|
2010-08-24
| ||
| 01:51 | Merge in the R-tree fix from the trunk. (check-in: 02ee0bd5 user: drh tags: apple-osx) | |
| 01:49 | The R-tree module should not assume that its shadow tables are consistent. If a problem is found in a shadow table, return SQLITE_CORRUPT. (check-in: 7f2f71cc user: drh tags: trunk) | |
| 01:08 | Merge changes through release 3.7.2 into the apple-osx branch. (check-in: 415c448d user: drh tags: apple-osx) | |
Changes
Changes to ext/rtree/rtree.c.
435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 |
*ppNode = pNode;
rc = sqlite3_reset(pRtree->pReadNode);
if( rc==SQLITE_OK && iNode==1 ){
pRtree->iDepth = readInt16(pNode->zData);
}
assert( (rc==SQLITE_OK && pNode) || (pNode==0 && rc!=SQLITE_OK) );
nodeHashInsert(pRtree, pNode);
return rc;
}
/*
** Overwrite cell iCell of node pNode with the contents of pCell.
*/
|
| | > > > |
435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 |
*ppNode = pNode;
rc = sqlite3_reset(pRtree->pReadNode);
if( rc==SQLITE_OK && iNode==1 ){
pRtree->iDepth = readInt16(pNode->zData);
}
if( pNode!=0 ){
nodeHashInsert(pRtree, pNode);
}else if( rc==SQLITE_OK ){
rc = SQLITE_CORRUPT;
}
return rc;
}
/*
** Overwrite cell iCell of node pNode with the contents of pCell.
*/
|