From: Date: May 6 2009 9:42am
Subject: bzr commit into mysql-5.1-telco-6.2 branch (jonas:2911) Bug#24521
List-Archive: http://lists.mysql.com/commits/73457
X-Bug: 24521
Message-Id: <20090506074245.A97A09404BF@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_sGAS8qf40VxowByL4yx5Mw)"

--Boundary_(ID_sGAS8qf40VxowByL4yx5Mw)
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/jonas/src/telco-6.2/ based on revid:jonas@stripped

 2911 Jonas Oreland	2009-05-06
      ndb - bug#24521
        Don't try to free a file that was never created

    M  storage/ndb/src/kernel/blocks/tsman.cpp
=== modified file 'storage/ndb/src/kernel/blocks/tsman.cpp'
--- a/storage/ndb/src/kernel/blocks/tsman.cpp	2009-02-18 21:56:20 +0000
+++ b/storage/ndb/src/kernel/blocks/tsman.cpp	2009-05-06 07:42:27 +0000
@@ -655,7 +655,12 @@ Tsman::execFSCLOSECONF(Signal* signal)
   
   if (ptr.p->m_state == Datafile::FS_CREATING)
   {
-    m_page_cache_client.free_data_file(ptr.p->m_file_no);  
+    if (ptr.p->m_file_no != RNIL)
+    {
+      jam();
+      m_page_cache_client.free_data_file(ptr.p->m_file_no);
+    }
+
     CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr();
     conf->senderData = senderData;
     conf->senderRef = reference();


--Boundary_(ID_sGAS8qf40VxowByL4yx5Mw)
MIME-version: 1.0
Content-type: text/bzr-bundle;
 name="bzr/jonas@stripped";
 charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jonas@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-6.2/
# testament_sha1: d25c44e97a33f0ffeb68eefd8466282e7a0029bf
# timestamp: 2009-05-06 09:42:45 +0200
# source_branch: bzr+ssh://joreland@stripped/bzrroot\
#   /server/mysql-5.1-telco-6.2/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXbH+gQAAZjfgFAQeeP//1Y1
kAC////6UAPNvd2Om41VV0UJJCCaGjJkTYpmhpExPQ1NNNABtQZImp6aJk08p6aU9RpsoAaGgAGg
A0QIj1MQMmgAAANAGjQA5gAJkwAJhMEwhgCMACSSNGUaYBqDVPUxG1PUGj0nqHqAHqCeCOmqrrlb
28/iR2aNnRteJMMpmujtfACD3dbybOkoBP7Z8kFYboTMx14iZTuFSQ+pEYgmzcsVCbn9XLTEUSFm
11AtQCdAzQK36NL9zDaJLvaiSBVdFZIn21XKUH+Vl2tkLiAh7i0lZhgvvt7RZ0lPCf8pGKs3lxN5
Jc0Z6aBNg5zmahgXUc4Mp0wnFYozOJw8RWQ4YpkSbViYIZ4aGMWGhxRX3GMo8RhDoQ89A+DKgUi4
mlXCGhItbcBym0aJ+CFfLKgWKgHKOwgWieF3E1n9yE6M09sEznKBqHkCw61PIWwIuDQAw6smeYk/
Ys/lcVkSk695cVSxbSWlot4xXfUPLyPlmc8ctJgG/zzGBw01gyDjwm+FcHGJyj9aHFLAc7TULxlT
uWCwNFBItJ1IZVpiuBojGuYZxIkdl+oqpieAoGQKoQ/BihhiA8T521ZVphlNaZA/xO8s5D2F4sfH
i84IBmNM6iZBNroNN9KkBh3glSSIIeMjEsaJmePSxpdWHMyrRA4slCE/OOhuWOAXl5vKyTpjFPbm
tLTOQejv95SbQoq6OemYUvgyRLGxtzd0o9g8A8R/ae+TKX3bw8DvKMx3DFeP5YyPXs0Ws/nK6Kzy
SKLnJ00+zRVz1CqMCCoTQrFZMcDtMNprAcOyoIrEM8znjNEvMyY4TXnsZL7mfvhmHoYfTObjDExD
m2gaIzka35onzqx/+TIaN9EPhtCBfin1aQMSKfTNemPWmLAZSHnTDbe4cUzvDjh2dpx3ASVL97rj
ZeWA1jZdO6pRXLIZdUhV0HTtNmYHoebu4K/pvdPkBrA7nV/ribfxu8GOg5NvUR3i6kcn4kjItqtA
4RcHcsKY4+UjCPqVY1wURTuia4vkV9Uih49NcuYnCkJhZCzHAuVJAL9nUR0yxya5DfPWwRshlqh2
b2fxLcrwUn+aITC9+xI5WkUEUl3as2Q2TTINgeBqtimOOJlkHXUBTmPG5wR/Qea+mzcUpFxXr9b5
IDl2lKGlxFoqbizpjFV43aWT9qzS5k7O/WEIDMeVo+NjIQdFAaCQ6k4y7Y2JjgA0gvTxKGuSIpVK
GpsvRocD07oD8g6i976130azE2nAKNBFJZrkFsQZEMYCUwtznFeqpxjX6KAE45t7M2gLzqnAxHoW
OUmlhmfjSPV1lZW+Wr1P+LuSKcKEg7Y/0CA=


--Boundary_(ID_sGAS8qf40VxowByL4yx5Mw)--