From: Date: June 25 2007 7:12am Subject: bk commit into 5.1 tree (jonas:1.2497) BUG#29057 List-Archive: http://lists.mysql.com/commits/29471 X-Bug: 29057 Message-Id: <20070625051232.D34E0718837@perch.ndb.mysql.com> Below is the list of changes that have just been committed into a local 5.1 repository of jonas. When jonas does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-06-25 07:12:27+02:00, jonas@stripped +1 -0 ndb - post merge 50/51 - bug#29057 bug#29067 and bug#29118 storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-06-25 07:12:25+02:00, jonas@stripped +1 -1 post merge # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: jonas # Host: perch.ndb.mysql.com # Root: /home/jonas/src/51-telco-gca --- 1.144/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-06-25 07:12:32 +02:00 +++ 1.145/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-06-25 07:12:32 +02:00 @@ -15605,7 +15605,7 @@ jam(); ndbrequire(logFilePtr.p->logFileStatus == LogFileRecord::OPEN); logFilePtr.p->logFileStatus = LogFileRecord::CLOSE_SR_INVALIDATE_PAGES; - closeFile(signal, logFilePtr); + closeFile(signal, logFilePtr, __LINE__); return; done: