/ Check-in [3a26a919]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a (harmless) shadowed local variable definition in the integrity_check logic.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3a26a919fd5550e5a0053a48cb93a27bb95cc916
User & Date: drh 2015-07-02 16:29:56
Context
2015-07-02
16:50
Simplify FTS5 handling in the MSVC makefile. check-in: f022e043 user: mistachkin tags: trunk
16:29
Fix a (harmless) shadowed local variable definition in the integrity_check logic. check-in: 3a26a919 user: drh tags: trunk
16:17
Smaller and faster PRAGMA integrity_check that also does a better job of detecting errors. Some output text describing discovered file corruption has changed for clarity. check-in: 251a7590 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/btree.c.

9097
9098
9099
9100
9101
9102
9103

9104
9105
9106
9107
9108
9109
9110
9111
9112
    ** cells have already been inserted.  But for internal pages, that has
    ** not yet been done, so do it now */
    if( !pPage->leaf ){
      heap = pCheck->heap;
      heap[0] = 0;
      btreeHeapInsert(heap, contentOffset-1);
      for(i=nCell-1; i>=0; i--){

        u32 pc = get2byteAligned(&data[cellStart+i*2]);
        u32 size = pPage->xCellSize(pPage, &data[pc]);
        btreeHeapInsert(heap, (pc<<16)|(pc+size-1));
      }
    }
    /* Add the freeblocks to the min-heap
    **
    ** EVIDENCE-OF: R-20690-50594 The second field of the b-tree page header
    ** is the offset of the first freeblock, or zero if there are no







>
|
|







9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
    ** cells have already been inserted.  But for internal pages, that has
    ** not yet been done, so do it now */
    if( !pPage->leaf ){
      heap = pCheck->heap;
      heap[0] = 0;
      btreeHeapInsert(heap, contentOffset-1);
      for(i=nCell-1; i>=0; i--){
        u32 size;
        pc = get2byteAligned(&data[cellStart+i*2]);
        size = pPage->xCellSize(pPage, &data[pc]);
        btreeHeapInsert(heap, (pc<<16)|(pc+size-1));
      }
    }
    /* Add the freeblocks to the min-heap
    **
    ** EVIDENCE-OF: R-20690-50594 The second field of the b-tree page header
    ** is the offset of the first freeblock, or zero if there are no