Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

7 files changed, 22 insertions, 26 deletions

diff --git a/configure.in b/configure.in
index d63859720a3..71adaa747f5 100644
--- a/configure.in
+++ b/configure.in
@@ -1039,8 +1039,8 @@ case $SYSTEM_TYPE in
     ;;
   *hpux11.*)
     echo "Enabling workarounds for hpux 11"
-    CFLAGS="$CFLAGS -DHPUX11 -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
-    CXXFLAGS="$CXXFLAGS -DHPUX11 -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
+    CFLAGS="$CFLAGS -DHPUX11  -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
+    CXXFLAGS="$CXXFLAGS -DHPUX11  -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
     if test "$with_named_thread" = "no"
     then 
       echo "Using --with-named-thread=-lpthread"
diff --git a/ndb/src/common/editline/sysunix.c b/ndb/src/common/editline/sysunix.c
index 1339e5769e2..d7437f6a9c7 100644
--- a/ndb/src/common/editline/sysunix.c
+++ b/ndb/src/common/editline/sysunix.c
@@ -139,7 +139,7 @@ rl_add_slash(char *path, char *p, size_t p_len)
     struct stat	Sb;
 
     if (stat(path, &Sb) >= 0) {
-      int len= strlen(p);
+      size_t len= strlen(p);
       if (len+1 < p_len) {
 	p[len]= S_ISDIR(Sb.st_mode) ? '/' : ' ';
 	p[len+1]= 0;
diff --git a/ndb/src/common/util/basestring_vsnprintf.c b/ndb/src/common/util/basestring_vsnprintf.c
index c96d1a300e1..7307279f345 100644
--- a/ndb/src/common/util/basestring_vsnprintf.c
+++ b/ndb/src/common/util/basestring_vsnprintf.c
@@ -35,7 +35,11 @@ basestring_snprintf(char *str, size_t size, const char *format, ...)
   #define BASESTRING_VSNPRINTF_FUNC(a,b,c,d) vsnprintf(a,b,c,d)
 #else
   #define SNPRINTF_RETURN_TRUNC
-  #define BASESTRING_VSNPRINTF_FUNC(a,b,c,d) my_vsnprintf(a,b,c,d)
+  /*  #define BASESTRING_VSNPRINTF_FUNC(a,b,c,d) my_vsnprintf(a,b,c,d)
+   *  we would like to use my_vsnprintf but it does not have enough features
+   *  Let's hope vsnprintf works anyways
+   */
+  #define BASESTRING_VSNPRINTF_FUNC(a,b,c,d) vsnprintf(a,b,c,d)
   extern int my_vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif
 #ifdef SNPRINTF_RETURN_TRUNC
@@ -46,7 +50,7 @@ basestring_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 {
   int ret= BASESTRING_VSNPRINTF_FUNC(str, size, format, ap);
 #ifdef SNPRINTF_RETURN_TRUNC
-  if (ret == size-1) {
+  if (ret == size-1 || ret == -1) {
     ret= BASESTRING_VSNPRINTF_FUNC(basestring_vsnprintf_buf,
 				   sizeof(basestring_vsnprintf_buf),
 				   format, ap);
diff --git a/ndb/src/kernel/vm/Emulator.hpp b/ndb/src/kernel/vm/Emulator.hpp
index bd240f8679b..b3c64830802 100644
--- a/ndb/src/kernel/vm/Emulator.hpp
+++ b/ndb/src/kernel/vm/Emulator.hpp
@@ -25,6 +25,7 @@
 //
 //===========================================================================
 #include <kernel_types.h>
+#include <TransporterRegistry.hpp>
 
 extern class  JobTable            globalJobTable;
 extern class  TimeQueue           globalTimeQueue;
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index 5b552836955..2672d8c9d4b 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -773,8 +773,10 @@ MgmApiSession::setClusterLogLevel(Parser<MgmApiSession>::Context &,
 
   /* XXX should use constants for this value */
   if(level > 15) {
-    errorString.assign("Invalied loglevel");
-    goto error;
+    m_output->println("set cluster loglevel reply");
+    m_output->println("result: Invalid loglevel");
+    m_output->println("");
+    return;
   }
 
   EventSubscribeReq req;
@@ -786,11 +788,6 @@ MgmApiSession::setClusterLogLevel(Parser<MgmApiSession>::Context &,
   m_output->println("set cluster loglevel reply");
   m_output->println("result: Ok");
   m_output->println("");
-  return;
-error:
-  m_output->println("set cluster loglevel reply");
-  m_output->println("result: %s", errorString.c_str());
-  m_output->println("");
 }
 
 void
@@ -807,8 +804,10 @@ MgmApiSession::setLogLevel(Parser<MgmApiSession>::Context &,
 
   /* XXX should use constants for this value */
   if(level > 15) {
-    errorString.assign("Invalied loglevel");
-    goto error;
+    m_output->println("set loglevel reply");
+    m_output->println("result: Invalid loglevel", errorString.c_str());
+    m_output->println("");
+    return;
   }
 
   EventSubscribeReq req;
@@ -820,11 +819,6 @@ MgmApiSession::setLogLevel(Parser<MgmApiSession>::Context &,
   m_output->println("set loglevel reply");
   m_output->println("result: Ok");
   m_output->println("");
-  return;
- error:
-  m_output->println("set loglevel reply");
-  m_output->println("result: %s", errorString.c_str());
-  m_output->println("");
 }
 
 void
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index 76854cabcd7..304d1b904d4 100644
--- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -47,15 +47,13 @@
  * Column
  */
 NdbColumnImpl::NdbColumnImpl()
-  : NdbDictionary::Column(* this), m_facade(this),
-    m_attrId(-1)
+  : NdbDictionary::Column(* this), m_attrId(-1), m_facade(this)
 {
   init();
 }
 
 NdbColumnImpl::NdbColumnImpl(NdbDictionary::Column & f)
-  : NdbDictionary::Column(* this), m_facade(&f),
-    m_attrId(-1)
+  : NdbDictionary::Column(* this), m_attrId(-1), m_facade(&f)
 {
   init();
 }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d06aba3387e..af6f25c1400 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2918,11 +2918,10 @@ we force server id to 2, but this MySQL server will not act as a slave.");
     exit(1);
 
 #ifdef __WIN__
-#define MYSQL_ERR_FILE "mysql.err"
   if (!opt_console)
   {
-    freopen(MYSQL_ERR_FILE,"a+",stdout);
-    freopen(MYSQL_ERR_FILE,"a+",stderr);
+    freopen(log_error_file,"a+",stdout);
+    freopen(log_error_file,"a+",stderr);
     FreeConsole();				// Remove window
   }
 #endif