List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:September 29 2010 7:59am
Subject:bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3841)
View as plain text  
#At file:///home/msvensson/mysql/tmp/vNlE5tPnpV/7.1/ based on revid:jonas@stripped9

 3841 Magnus Blåudd	2010-09-29 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/common/portlib/NdbDir.cpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
=== modified file 'storage/ndb/src/common/portlib/NdbDir.cpp'
--- a/storage/ndb/src/common/portlib/NdbDir.cpp	2010-09-23 09:10:53 +0000
+++ b/storage/ndb/src/common/portlib/NdbDir.cpp	2010-09-29 07:54:14 +0000
@@ -209,7 +209,7 @@ NdbDir::create(const char *dir, mode_t m
       return true;
 
     fprintf(stderr,
-            "Failed to create directory '%s', error: %d",
+            "Failed to create directory '%s', error: %d\n",
             dir, GetLastError());
     return false;
   }
@@ -220,7 +220,7 @@ NdbDir::create(const char *dir, mode_t m
       return true;
 
     fprintf(stderr,
-            "Failed to create directory '%s', error: %d",
+            "Failed to create directory '%s', error: %d\n",
             dir, errno);
     return false;
   }

=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2010-09-23 09:36:19 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2010-09-29 07:54:14 +0000
@@ -137,7 +137,8 @@ bool
 do_mkdir(const char * path)
 {
   return NdbDir::create(path,
-                        NdbDir::u_rwx() | NdbDir::g_r() | NdbDir::g_x());
+                        NdbDir::u_rwx() | NdbDir::g_r() | NdbDir::g_x(),
+                        true /* ignore_existing */);
 }
 
 static

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20100929075905-19mwu6anscoh2l78.bundle
Thread
bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3841) Magnus Blåudd29 Sep