#At file:///C:/bzr/mysql-6.0-falcon-team/
2777 Vladislav Vaintroub 2008-08-13
Post-review fix.
modified:
storage/falcon/Table.cpp
storage/falcon/Transaction.cpp
storage/falcon/TransactionManager.cpp
=== modified file 'storage/falcon/Table.cpp'
--- a/storage/falcon/Table.cpp 2008-08-11 13:22:53 +0000
+++ b/storage/falcon/Table.cpp 2008-08-13 10:18:40 +0000
@@ -3333,7 +3333,7 @@ bool Table::hasUncommittedRecords(Transa
void Table::waitForWriteComplete()
{
- return database->waitForWriteComplete(this);
+ database->waitForWriteComplete(this);
}
RecordVersion* Table::lockRecord(Record* record, Transaction* transaction)
=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp 2008-08-13 08:48:34 +0000
+++ b/storage/falcon/Transaction.cpp 2008-08-13 10:18:40 +0000
@@ -934,7 +934,7 @@ void Transaction::truncateTable(Table* t
bool Transaction::hasRecords(Table* table)
{
// This lock is to avoid race with writeComplete
- Sync sync(&syncIndexes, "Transaction::releaseDependency");
+ Sync sync(&syncIndexes, "Transaction::hasRecords");
sync.lock(Exclusive);
for (RecordVersion *rec = firstRecord; rec; rec = rec->nextInTrans)
if (rec->format->table == table)
=== modified file 'storage/falcon/TransactionManager.cpp'
--- a/storage/falcon/TransactionManager.cpp 2008-08-11 13:22:53 +0000
+++ b/storage/falcon/TransactionManager.cpp 2008-08-13 10:18:40 +0000
@@ -183,7 +183,7 @@ void TransactionManager::waitForWriteCom
{
bool again = false;
Sync committedTrans (&committedTransactions.syncObject,
- "waitForWriteComplete");
+ "TransactionManager::waitForWriteComplete");
committedTrans.lock (Shared);
for (Transaction *trans = committedTransactions.first; trans;
@@ -200,7 +200,7 @@ void TransactionManager::waitForWriteCom
return;
committedTrans.unlock();
- Thread::getThread("waitForWriteComplete")->sleep(500);
+ Thread::getThread("TransactionManager::waitForWriteComplete")->sleep(500);
}
}
void TransactionManager::commitByXid(int xidLength, const UCHAR* xid)
