bzr commit into mysql-5.1-telco-6.2 branch (jonas:2911) Bug#24521

[Jonas Oreland]

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


Attachment: [text/bzr-bundle] bzr/[e-mail]