bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3088) Bug#49724

[Magnus Blåudd]

#At file:///home/msvensson/mysql/6.3/ based on revid:jonas@strippedirds

 3088 Magnus Blåudd	2010-01-25
      Merge patch for bug#49724 to 6.3

    modified:
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
=== modified file 'storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp'
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2009-10-12 06:21:54 +0000
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2010-01-25 08:36:04 +0000
@@ -478,9 +478,14 @@ void Cmvmi::execSTTOR(Signal* signal)
        */
       refresh_watch_dog(9);
       int res = NdbMem_MemLockAll(0);
-      if(res != 0){
-        g_eventLogger->warning("Failed to memlock pages");
-	warningEvent("Failed to memlock pages");
+      if (res != 0)
+      {
+        char buf[100];
+        BaseString::snprintf(buf, sizeof(buf), 
+                             "Failed to memlock pages, error: %d (%s)",
+                             errno, strerror(errno));
+        g_eventLogger->warning("%s", buf);
+        warningEvent("%s", buf);
       }
     }
     
@@ -851,7 +856,6 @@ void Cmvmi::execSTOP_ORD(Signal* signal)
 
 void
 Cmvmi::execSTART_ORD(Signal* signal) {
-
   StartOrd * const startOrd = (StartOrd *)&signal->theData[0];
   jamEntry();
   
@@ -918,8 +922,12 @@ Cmvmi::execSTART_ORD(Signal* signal) {
       int res = NdbMem_MemLockAll(1);
       if(res != 0)
       {
-        g_eventLogger->warning("Failed to memlock pages");
-	warningEvent("Failed to memlock pages");
+        char buf[100];
+        BaseString::snprintf(buf, sizeof(buf),
+                             "Failed to memlock pages, error: %d (%s)",
+                             errno, strerror(errno));
+        g_eventLogger->warning("%s", buf);
+        warningEvent("%s", buf);
       }
       else
       {

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