bk commit into 4.1 tree (jimw:1.2142) BUG#9323

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2142 05/03/22 16:00:02 jimw@stripped +3 -0
  Fix calls to memset() with arguments out of order. (Bug #9323)

  ndb/src/kernel/vm/VMSignal.cpp
    1.2 05/03/22 13:46:52 jimw@stripped +2 -2
    Fix order of arguments to memset()

  bdb/btree/bt_open.c
    1.4 05/03/22 13:41:06 jimw@stripped +1 -1
    Fix order of arguments to memset()

  bdb/hash/hash_open.c
    1.2 05/03/22 13:40:14 jimw@stripped +1 -1
    Fix order of arguments to memset()

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-9323

--- 1.1/ndb/src/kernel/vm/VMSignal.cpp	2004-04-14 01:24:23 -07:00
+++ 1.2/ndb/src/kernel/vm/VMSignal.cpp	2005-03-22 13:46:52 -08:00
@@ -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

--- 1.1/bdb/hash/hash_open.c	2002-10-30 03:52:13 -08:00
+++ 1.2/bdb/hash/hash_open.c	2005-03-22 13:40:14 -08:00
@@ -409,7 +409,7 @@
 			goto err;
 	} else {
 #ifdef DIAGNOSTIC
-		memset(buf, dbp->pgsize, 0);
+		memset(buf, 0, dbp->pgsize);
 #endif
 		page = (PAGE *)buf;
 	}

--- 1.3/bdb/btree/bt_open.c	2002-10-30 03:48:32 -08:00
+++ 1.4/bdb/btree/bt_open.c	2005-03-22 13:41:06 -08:00
@@ -489,7 +489,7 @@
 			goto err;
 	} else {
 #ifdef DIAGNOSTIC
-		memset(buf, dbp->pgsize, 0);
+		memset(buf, 0, dbp->pgsize);
 #endif
 		root = (PAGE *)buf;
 	}