From: Kevin Lewis
Date: July 24 2009 5:56pm
Subject: bzr commit into mysql-6.0-falcon-team branch (kevin.lewis:2758)
 Bug#46324
List-Archive: http://lists.mysql.com/commits/79270
X-Bug: 46324
Message-Id: <0KNA00LPUSHVHCC0@mail-amer.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_QpZALwfmY7/4dKrM6oEk/Q)"

--Boundary_(ID_QpZALwfmY7/4dKrM6oEk/Q)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#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)


--Boundary_(ID_QpZALwfmY7/4dKrM6oEk/Q)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/kevin.lewis@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/kevin.lewis@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kevin.lewis@stripped
# target_branch: file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/
# testament_sha1: 6251be92e6bc87fd9d1e5a737e9d7b841f3e62e1
# timestamp: 2009-07-24 12:56:17 -0500
# source_branch: file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/
# base_revision_id: john.embretsen@stripped\
#   zrrnf5yrm3h6um2f
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbo3iXUAAa7fgEAwW2f//94s
HAS////wUARtLwGzavWbbBNCUQmVJ+T1GmjUZ6mgp+TVPCRkPSNojCHqHNMTARpgRhGAAAAJhGAy
IBTUzFPUeo9J6mg09Q9Q0Mg9Q0NACRU01Hoj1TbVNM1E8htSHqMmmNR6CMmgAkkCAGo0aamU9R6m
mag9TJppo0NAMmFoNRVnmoXJ2V2SXy/nIk5MwqYV6oua4CfOx2Bq4T11KddKNsjXjnUaq0RBHAbG
xqi5o43NY+zNKnZR5j9TcD/VnC5/l++sf+mUzsgRY17KFNiiqYsOBuV91em326ejo7VstKu8R2rO
1EG43hJffUzW9hc3T3u+XqzRdHizYUTPyQozlIg+nGGaavh0g3VUSlIdItKYpTwIBpCc8tRFkXgp
pVTfzdPOOEsDEknExOHCGEWkyKpqORicrizocrrpP6LjzWzKqXRwXdGfAhC40mmsiqBY8/K9rbSY
cIjKddcakKwdiMoiiU4sk80nE9IX1xYcb6suWdiyM8EPeZly/hpIwwN1CgEBNgX37bZHaz1sLSdR
rHFxwIH9YzjsvIZZdL8QccDxK1US2CxZPygVw6AhKLje5J3siUXbTJWDzqoPWpC1MRTBYwqDueQF
NX2LMYt2NKhtA7RvXSxTK55FYDGAiMHBvgZGDZzSL0fVglCiTJ49RNoaSR8xUEO25MvgbVE/Cl26
dYC9WJVchF2A0drHqHouctytDigLsaFBrxaKIstfK2Z/fgsIiozQyZJi5QVZfS4qAgyjxXON+BEw
xdwvCgbUUnUfGjAhHHByOsVtwr4edeBrrCv3ceJUOnyHjiPYZ+HAiWCVSEfUjqTYF5mUidG1XwFW
ZuhdyIQKzncEUQUnIYOk730b7HvPzfqJ7jMgUqC947wqEowKb7DGTY2SGwS1xVc6V7HbCJfjF+tW
+c4kHm5townB/pTdqNX1lje0vl0mWhZgrA4lQJB3po3xhlZCQMkV/GhHzp7cwGAe9YE6Q8ddl96S
sTYdO15YadZ4ezkbbC8euzK31mmhy63u4DhyUD8EDKfHtTOBttzgrUTQo3za3HIVO6g5zXUbA0e1
eNBnBmA4BNuOe7VHHIvaTTYbYMC0DApHh0GgiL6ew24C1kT7zcyCLYD/zFI2nES9hySkJj5gMcqW
fQzU7xN+2efBIqWXFXMqFc8cGvhAkYi9p1WFUzLdf2yLBmbyaK0hr4qsCrOMomjSXzMQV7EaFDvc
Y8nWVI39e0xImEmDabQ1mInpwHSLguobjxU9exCmhsbSO6EEWItRUiaK4LSzPStag57jDDnVsSwM
4rxSuyZlry5R5DV9pbBXVUm1mRHh3Nf2tKnVerBSV3dio1DTOy5ZFkU69AcSopGNjT5DtVUhwA6o
XoyNT1toqg8uKgGkpdRqbQ9auaoPFIay9SY7DfAeHqHD2maPJmI2TkFLr7ytq8xx6BERWopXysko
rUhiRiVmpzFzc/hb3JfEExJrMCFXdTSgGMr8C3r5Z0INRHvvgs9lAzN5u9Ux1ihsw2m6FholpX/F
3JFOFCQujeJdQA==


--Boundary_(ID_QpZALwfmY7/4dKrM6oEk/Q)--