MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:March 4 2010 1:00pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3423)
Bug#46114
View as plain text  
#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedxhahx059h8

 3423 Magnus Blåudd	2010-03-04
      Bug#46114 ndb_mgm "help" does not show help for all commands
       - Remove the 'my_vfprintf' function and revert to use vfprintf - i.e like
         it was before and which works fine in many other places

    modified:
      storage/ndb/src/common/util/OutputStream.cpp
=== modified file 'storage/ndb/src/common/util/OutputStream.cpp'
--- a/storage/ndb/src/common/util/OutputStream.cpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/common/util/OutputStream.cpp	2010-03-04 12:59:58 +0000
@@ -22,23 +22,6 @@
 #include <OutputStream.hpp>
 #include <socket_io.h>
 
-size_t my_vfprintf(FILE *f, const char* fmt, va_list ap)
-{
-  size_t size= 1024, len;
-  char *buf= (char*)malloc(size);
-  if(!buf)
-    return 0;
-  len= my_vsnprintf(buf, size, fmt, ap);
-  if(len >= size)
-  {
-    buf= (char*)realloc(buf, ++len);
-    len= my_vsnprintf(buf, len, fmt, ap);
-  }
-  len= fprintf(f, "%s", buf);
-  free(buf);
-  return len;
-}
-
 FileOutputStream::FileOutputStream(FILE * file){
   f = file;
 }
@@ -47,7 +30,7 @@ int
 FileOutputStream::print(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = my_vfprintf(f, fmt, ap);
+  const int ret = vfprintf(f, fmt, ap);
   va_end(ap);
   return ret;
 }
@@ -56,7 +39,7 @@ int
 FileOutputStream::println(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = my_vfprintf(f, fmt, ap);
+  const int ret = vfprintf(f, fmt, ap);
   va_end(ap);
   return ret + fprintf(f, "\n");
 }

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20100304125958-e7z5ut78xvln6d77.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3423)Bug#46114Magnus Blåudd4 Mar