From 5ed4fd6ba93c9e30c17d922da86c8e0df0e92e50 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Tue, 15 Mar 2005 16:37:05 -0800
Subject: [PATCH 1/2] Fix 'tee' command in mysql client. (Bug #8499)

client/mysql.cc:
  A va_list can't be reused without being copied or reset, so
  don't try to reuse it in tee_fprintf().
---
 client/mysql.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index 46bfc7d880f..0c229796c1e 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3073,9 +3073,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);
+  }
 }
 
 

From 18e7d8f6d78fe83a1d4b53e605cfc4a22096fb45 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Tue, 22 Mar 2005 16:00:02 -0800
Subject: [PATCH 2/2] Fix calls to memset() with arguments out of order. (Bug
 #9323)

bdb/hash/hash_open.c:
  Fix order of arguments to memset()
bdb/btree/bt_open.c:
  Fix order of arguments to memset()
ndb/src/kernel/vm/VMSignal.cpp:
  Fix order of arguments to memset()
---
 bdb/btree/bt_open.c            | 2 +-
 bdb/hash/hash_open.c           | 2 +-
 ndb/src/kernel/vm/VMSignal.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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/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