Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged

3 files changed, 9 insertions, 2 deletions

diff --git a/mysys/my_vsnprintf.c b/mysys/my_vsnprintf.c
index 7490ab4a9f2..e49b1d0e729 100644
--- a/mysys/my_vsnprintf.c
+++ b/mysys/my_vsnprintf.c
@@ -23,11 +23,15 @@
 
 int my_snprintf(char* to, size_t n, const char* fmt, ...)
 {
+  int result;
   va_list args;
   va_start(args,fmt);
-  return my_vsnprintf(to, n, fmt, args);
+  result= my_vsnprintf(to, n, fmt, args);
+  va_end(args);
+  return result;
 }
 
+
 int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
 {
   char *start=to, *end=to+n-1;
@@ -79,6 +83,7 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
   return (uint) (to - start);
 }
 
+
 #ifdef MAIN
 #define OVERRUN_SENTRY  250
 static void my_printf(const char * fmt, ...)
@@ -99,6 +104,7 @@ static void my_printf(const char * fmt, ...)
   va_end(ar);
 }
 
+
 int main()
 {
 
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index fd1a115ddff..a1fb09d049b 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -1037,7 +1037,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg,
 			&keydef, table_arg->keys*sizeof(MI_KEYDEF),
 			&keyseg,
 			((table_arg->key_parts + table_arg->keys) * sizeof(MI_KEYSEG)),
-			0)))
+			NullS)))
     DBUG_RETURN(1);
 
   pos=table_arg->key_info;
diff --git a/sql/log.cc b/sql/log.cc
index 194abdb6839..1e903613300 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1560,6 +1560,7 @@ void sql_print_error(const char *format,...)
     char buff[1024];
     my_vsnprintf(buff,sizeof(buff)-1,format,args);
     DBUG_PRINT("error",("%s",buff));
+    va_end(args);
     va_start(args,format);
   }
 #endif