← Back to branch summary

~m.ch/mysql-server/mysql-6.0-sigar-plugin

« back to all changes in this revision

Viewing changes to storage/falcon/Table.cpp

  • Committer: Davi Arnaut
  • Date: 2008-08-12 04:38:50 UTC
  • mfrom: (2764 mysql-6.0-to-merge)
  • mto: This revision was merged to the branch mainline in revision 2765.
  • Revision ID: davi.arnaut@sun.com-20080812043850-9tr1ojwrnv15r0gd
Merge mysql-6.0 into mysql-6.0-bugteam

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/Table.cpp
396
396
                 if (format->version == version)
397
397
                        return format;
398
398
 
399
 
        Sync syncObj(&syncObject, "Table::getFormat");
 
399
        Sync syncObj(&syncObject, "Table::getFormat(1)");
400
400
        syncObj.lock(Exclusive);
401
401
 
402
 
        Sync syncDDL(&database->syncSysDDL, "Table::getFormat");
 
402
        Sync syncDDL(&database->syncSysDDL, "Table::getFormat(2)");
403
403
        syncDDL.lock(Shared);
404
404
 
405
405
        PStatement statement = database->prepareStatement(
814
814
        primaryKey = NULL;
815
815
        formats = NEW Format* [FORMAT_HASH_SIZE];
816
816
 
 
817
        static char name[SYNC_VERSIONS_SIZE][64];
817
818
        for (int n = 0; n < SYNC_VERSIONS_SIZE; n++)
818
819
                {
819
 
                char name[64];
820
 
                sprintf(name, "syncPriorVersions[%02d]", n);
821
 
                syncPriorVersions[n].setName(name);
 
820
                sprintf(name[n], "syncPriorVersions[%02d]", n);
 
821
                syncPriorVersions[n].setName(name[n]);
822
822
                }
823
823
                
824
824
        triggers = NULL;
836
836
        syncTriggers.setName("Table::syncTriggers");
837
837
        syncScavenge.setName("Table::syncScavenge");
838
838
        syncAlter.setName("Table::syncAlter");
 
839
        for (int n = 0; n < SYNC_VERSIONS_SIZE; n++)
 
840
                syncPriorVersions[n].setName("Table::syncPriorVersions");
839
841
}
840
842
 
841
843
Record* Table::fetch(int32 recordNumber)
1227
1229
        RecordVersion *record = NULL;
1228
1230
        bool updated = false;
1229
1231
        int recordNumber = oldRecord->recordNumber;
1230
 
        Sync scavenge(&syncScavenge, "Table::update(2)");
 
1232
        Sync scavenge(&syncScavenge, "Table::update(1)");
1231
1233
        //scavenge.lock(Shared);
1232
1234
        
1233
1235
        try
3064
3066
 
3065
3067
        RecordVersion *record = NULL;
3066
3068
        bool updated = false;
3067
 
        Sync scavenge(&syncScavenge, "Table::update");
 
3069
        Sync scavenge(&syncScavenge, "Table::update(2)");
3068
3070
        //scavenge.lock(Shared);
3069
3071
        
3070
3072
        if (candidate->state == recLock && candidate->getTransaction() == transaction)