MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Martin Skold Date:March 2 2010 12:02pm
Subject:bzr commit into mysql-5.1-telco-7.1 branch (Martin.Skold:3475) Bug#47120
View as plain text  
#At file:///home/marty/MySQL/mysql-5.1-telco-7.1_merge/

 3475 Martin Skold	2010-03-02 [merge]
      Merge
      modified:
        storage/ndb/src/kernel/error/ErrorReporter.cpp

=== modified file 'storage/ndb/src/kernel/error/ErrorReporter.cpp'
--- a/storage/ndb/src/kernel/error/ErrorReporter.cpp	2009-09-24 18:11:21 +0000
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp	2010-02-25 05:06:59 +0000
@@ -160,15 +160,21 @@ ErrorReporter::formatMessage(int thr_no,
     for (Uint32 i = 1 ; i < num_threads; i++)
     {
       sofar = strlen(messptr);
-      BaseString::snprintf(messptr + sofar, MESSAGE_LENGTH - sofar,
-                           " %s_t%u", theNameOfTheTraceFile, i);
+      if(sofar < MESSAGE_LENGTH)
+      {
+	BaseString::snprintf(messptr + sofar, MESSAGE_LENGTH - sofar,
+			     " %s_t%u", theNameOfTheTraceFile, i);
+      }
     }
   }
 
   sofar = strlen(messptr);
-  BaseString::snprintf(messptr + sofar, MESSAGE_LENGTH - sofar,
-                       "\n"
-                       "***EOM***\n");
+  if(sofar < MESSAGE_LENGTH)
+  {
+    BaseString::snprintf(messptr + sofar, MESSAGE_LENGTH - sofar,
+                         "\n"
+                         "***EOM***\n");
+  }
 
   // Add trailing blanks to get a fixed length of the message
   while (strlen(messptr) <= MESSAGE_LENGTH-3){

Thread
bzr commit into mysql-5.1-telco-7.1 branch (Martin.Skold:3475) Bug#47120Martin Skold2 Mar