← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/repository_ms.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-03 10:04:55 UTC
  • mfrom: (2382 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2384.
  • Revision ID: olafvdspek@gmail.com-20110803100455-2oqzyi77v4gykhy0
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/repository_ms.cc
584
584
                        //Shift the metadata in the header
585
585
                        if (CS_GET_DISK_2(ptr.rp_head->rb_mdata_size_2)) {
586
586
                                uint16_t  mdata_size, mdata_offset, alias_offset, shift;
 
587
                                (void)mdata_size;
587
588
                                
588
589
                                shift = new_size - head_size;
589
590
                                mdata_size = CS_GET_DISK_2(ptr.rp_head->rb_mdata_size_2);
775
776
        uint16_t                        alias_offset;
776
777
        uint32_t                        alias_hash;
777
778
 
 
779
        (void)alias_offset;
 
780
        (void)alias_hash;
 
781
 
778
782
        enter_();
779
783
        /* Lock the BLOB: */
780
784
        mylock = &myRepo->myRepoLock[offset % CS_REPO_REC_LOCK_COUNT];
1188
1192
        MSRepoTempRefPtr        my_ref = NULL;
1189
1193
        uint16_t                                ref_type = MS_BLOB_FREE_REF;
1190
1194
        enter_();
 
1195
        (void)modified;
 
1196
        (void)my_ref;
1191
1197
        
1192
1198
        /* Lock the BLOB: */
1193
1199
        mylock = &myRepo->myRepoLock[offset % CS_REPO_REC_LOCK_COUNT];
1630
1636
                                        break;
1631
1637
                                }
1632
1638
                                uint16_t ref_count, mdata_size, mdata_offset;
 
1639
                                (void)ref_count;
1633
1640
                                
1634
1641
                                status = CS_GET_DISK_1(blob.rb_status_1);
1635
1642
                                ref_size = CS_GET_DISK_1(blob.rb_ref_size_1);