Changes On Branch cluster-changes
Not logged in

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

Changes In Branch cluster-changes Excluding Merge-Ins

This is equivalent to a diff from 619fa857c9 to 5c6891b2ab

2014-07-22
22:26
Do not delete phantom artifacts from the unclustered table. check-in: 3fa7965c64 user: drh tags: trunk
20:33
Add an alternative comment printing algorithm, disabled by default, which permits the pre-existing comment formatting to be preserved. check-in: b6c9d35b1c user: mistachkin tags: trunk
08:03
Receive updates from trunk. Closed-Leaf check-in: 5c6891b2ab user: andybradford tags: cluster-changes
2014-07-20
13:20
Merge from trunk check-in: c4fca467f7 user: ashish tags: ashish-ipv6
02:10
Merge updates from trunk. check-in: 5ea6a95a7b user: mistachkin tags: experimental
2014-07-19
19:20
Allow commits against a closed leaf as long as the new commit is on a different branch. check-in: 619fa857c9 user: drh tags: trunk
19:04
Update config.guess and config.sub from upstream. check-in: 76370b4c97 user: drh tags: trunk
16:29
Only allow a checkin against a closed leaf if it is not the same branch. Closed-Leaf check-in: d1b5fd8738 user: andybradford tags: pending-review
2014-07-07
04:52
Bring in latest fixes. check-in: 088e961a2b user: andybradford tags: cluster-changes

Changes to src/xfer.c.

698
699
700
701
702
703
704
705

706
707
708
709
710
711
712
        nUncl -= nRow;
        nRow = 0;
        blob_appendf(&deleteWhere, ",%d", rid);
      }
    }
    db_finalize(&q);
    db_multi_exec(
      "DELETE FROM unclustered WHERE rid NOT IN (0 %s)",

      blob_str(&deleteWhere)
    );
    blob_reset(&deleteWhere);
    if( nRow>0 ){
      md5sum_blob(&cluster, &cksum);
      blob_appendf(&cluster, "Z %b\n", &cksum);
      blob_reset(&cksum);







|
>







698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
        nUncl -= nRow;
        nRow = 0;
        blob_appendf(&deleteWhere, ",%d", rid);
      }
    }
    db_finalize(&q);
    db_multi_exec(
      "DELETE FROM unclustered WHERE rid NOT IN (0 %s)"
      "   AND NOT EXISTS(SELECT 1 FROM phantom WHERE rid=unclustered.rid)",
      blob_str(&deleteWhere)
    );
    blob_reset(&deleteWhere);
    if( nRow>0 ){
      md5sum_blob(&cluster, &cksum);
      blob_appendf(&cluster, "Z %b\n", &cksum);
      blob_reset(&cksum);