#At file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/ based on revid:john.embretsen@stripped
2758 Kevin Lewis 2009-07-24
Bug#46324 - Crash in log statement is avoided by checking the vilidity of connection pointer and connection->currentStatement.
modified:
storage/falcon/Transaction.cpp
=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp 2009-07-14 14:09:58 +0000
+++ b/storage/falcon/Transaction.cpp 2009-07-24 17:56:07 +0000
@@ -549,8 +549,11 @@ void Transaction::chillRecords()
if (database->lowMemory && !systemTransaction)
backlogRecords();
- Log::log(LogInfo, "%d: Record chill: transaction %ld, %ld records, %ld bytes %s\n", database->deltaTime, transactionId, chilledRecords-chilledBefore,
- (uint32)(totalDataBefore-totalRecordData), committedRecords, connection->currentStatement);
+ Log::log(LogInfo, "%d: Record chill: transaction %ld, %ld records, %ld bytes %s\n",
+ database->deltaTime, transactionId, chilledRecords-chilledBefore,
+ (uint32)(totalDataBefore-totalRecordData), committedRecords,
+ ( (connection && connection->currentStatement)
+ ? connection->currentStatement : "" ) );
}
char* Transaction::thaw(RecordVersion* record, int* bytesReallocated)
Attachment: [text/bzr-bundle] bzr/kevin.lewis@sun.com-20090724175607-lplbjytoapmjbqag.bundle
Thread |
---|
• bzr commit into mysql-6.0-falcon-team branch (kevin.lewis:2758)Bug#46324 | Kevin Lewis | 24 Jul |