diff --git a/bdb/btree/bt_open.c b/bdb/btree/bt_open.c
index 0b72391c267..24da41e9893 100644
--- a/bdb/btree/bt_open.c
+++ b/bdb/btree/bt_open.c
@@ -489,7 +489,7 @@ __bam_new_file(dbp, txn, fhp, name)
 			goto err;
 	} else {
 #ifdef DIAGNOSTIC
-		memset(buf, dbp->pgsize, 0);
+		memset(buf, 0, dbp->pgsize);
 #endif
 		root = (PAGE *)buf;
 	}
diff --git a/bdb/hash/hash_open.c b/bdb/hash/hash_open.c
index 041a1df1e7b..f976f5b6816 100644
--- a/bdb/hash/hash_open.c
+++ b/bdb/hash/hash_open.c
@@ -409,7 +409,7 @@ __ham_new_file(dbp, txn, fhp, name)
 			goto err;
 	} else {
 #ifdef DIAGNOSTIC
-		memset(buf, dbp->pgsize, 0);
+		memset(buf, 0, dbp->pgsize);
 #endif
 		page = (PAGE *)buf;
 	}
diff --git a/client/mysql.cc b/client/mysql.cc
index a1071daffea..8d5117a29e0 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3090,9 +3090,14 @@ void tee_fprintf(FILE *file, const char *fmt, ...)
 #ifdef OS2
   fflush( file);
 #endif
-  if (opt_outfile)
-    (void) vfprintf(OUTFILE, fmt, args);
   va_end(args);
+
+  if (opt_outfile)
+  {
+    va_start(args, fmt);
+    (void) vfprintf(OUTFILE, fmt, args);
+    va_end(args);
+  }
 }
 
 
diff --git a/ndb/src/kernel/vm/VMSignal.cpp b/ndb/src/kernel/vm/VMSignal.cpp
index bffca6f6541..e4eafb47ff7 100644
--- a/ndb/src/kernel/vm/VMSignal.cpp
+++ b/ndb/src/kernel/vm/VMSignal.cpp
@@ -18,8 +18,8 @@
 #include <string.h>
 
 Signal::Signal(){
-  memset(&header, sizeof(header), 0);
-  memset(theData, sizeof(theData), 0);
+  memset(&header, 0, sizeof(header));
+  memset(theData, 0, sizeof(theData));
 }
 
 void