bzr push into mysql-6.0-falcon-team branch (kevin.lewis:2757 to 2758) Bug#46324

[Kevin Lewis]

 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
 2757 John H. Embretsen	2009-07-17
      Bug#45331: Add falcon_bug_22150-big and falcon_bug_36294-big to list of test to run on weekly basis in PB2. These tests will probably fail due to bug 45845.

    modified:
      mysql-test/collections/mysql-6.0-falcon-team.weekly
=== 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/[e-mail]