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

--Boundary_(ID_Pi3vMJB6xpqiZg2CMCWBFA)
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:ole.john.aske@stripped

 2912 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:44:20 +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_Pi3vMJB6xpqiZg2CMCWBFA)
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: c91006cc58f3aab78296447176f5e50b5a2f0d13
# timestamp: 2009-05-06 09:44:36 +0200
# source_branch: bzr+ssh://joreland@stripped/bzrroot\
#   /server/mysql-5.1-telco-6.2/
# base_revision_id: ole.john.aske@stripped\
#   1syky0gb3fiuj5az
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVyaWWQAAZbfgFAQeeP//1Y1
kAC////6UAP6eauW4RVs21BKIJMKnsEI8jU9MgSPCTxQ9T1GZQyDSmiepmppso2o9Q9TJoAAAAA0
BJKeRMUZU/VNP0EnigemoAAGQ0B6hzAATJgATCYJhDAEYAEkiNNRppPE0YhBp6aQQ09MkNABpjAu
erPhRuv3/A3bKZ+Dm1VIZWbfPc8AQ93B545CCQk3F/PjUcvBVU6/c7Oh1OaeLmTHb6dNcnb8+7/3
QZMjHrJCwMikKj8R40/FtOXR3NDdOZVqEZX4NRCHvLWxhi60V8H0KysyCIOKi2lKaq/XKS6WqX6G
TCZUVrYUkmuTmijJATYpOne9m7JhxsTCOWAtBNwkTDhwmMTUKw6maBQ4hyOWS0YkmVpmuppMYJcZ
Rhl9OQzl46jNRk5SW0LWOnNutl3KGXOwq5ELNutm4xvIEVKFNhzaoqbmwVHpUcmXHSYGlf2NtizK
lAstbwJkHKkCeQDg0zeSgkIDBPgCQsFFLWhCQgFK4IjR0w8FA4ZAZxdEOzlCFgS4VA8z8jEgnUBq
0mjgJ8VyaDj9fNaCrL5sBGwwqNZMXGBa+/LIY1DsVhziKYh+dirSoPMx0mojI1lmdikcpKicIcjA
q8yVhcmOmyXATnmrd0YjbP0V52uYQLnGuaAwMKop7XM/kHf/XGyJNXIlTG4vVEc6bjBSvCRwXGwy
EHXDmlzEhhHNQ5bZyOhH4p+GOMSHcoG9IsCmefdvUbuN5+EUa42nvLOX26QaJvKX/WcuFKpMBziI
rL8tqt5RMf5WIhTaxGRze6zyNprKyZSppqBZ3mBibzeWbS8cO1RJ1pS6DFjlY/kNNibz1WXE2yd0
lA9DD6uBWaosSc2rGgYHbTJHY72TIaOiWau4IlVilwFmzAWGVQi+1MdnSOLgrIDppuvYMHpjmcGr
zp2GvyTOBD30WlzEL1WwFzLRbvWGpQ6ii+4WaU88C/aBwlNm8KPXrdJpAtAwyp8tid/mZb09rOh6
IryNKkODeaRgPS5LEuRUJqxIdLfTqzvnS9hHYatK4qR0b6nTWWsx/gE5HJd1Xp0uAyDi8gFN9pCm
MJvGY6r7GCDIZapO7Wz+BroxXXcQBZf6yX+gB3xRmRQo8nqvT5SSMcCwOu61t26xXQPfQEkyZ4oh
adpstvKALTHV0uwOGJrKEFhiJ8xV8RiU78ubJ8L8Fdi+sIgZj2bR5saCLpQNAF2RypvmxY7QGioi
44lLawIZFKLIHb4J3NT+zTYHy8ZB+Udo3O/q6O+UbZ1FxUTMiyl7to8mJsteZtg2ZLyQo8WAWCyp
s/o4DIfQXh1UxnH1i0cDwFOczYwnKNzHau8T36FN0AcXdIWl757vQ/4u5IpwoSC5NLLI


--Boundary_(ID_Pi3vMJB6xpqiZg2CMCWBFA)--