From: Date: February 27 2007 2:18pm
Subject: bk commit into 5.0 tree (msvensson:1.2446) BUG#26678
List-Archive: http://lists.mysql.com/commits/20645
X-Bug: 26678
Message-Id: <200702271318.l1RDIF1E019184@pilot.blaudden>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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@stripped, 2007-02-27 14:18:12+01:00, msvensson@stripped +2 -0
  Bug#26678 SSL tests fail on win64
   - Import a patch from yaSSL CVS that uses "word" instead
  of "unsigned long" in three function's that uses sizeof to find
  out the word size being used. NOTE! long is 32 bit also on 
  64 bit windows.

  extra/yassl/taocrypt/include/misc.hpp@stripped, 2007-02-27 12:05:12+01:00, msvensson@stripped +3 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@stripped, 2007-02-27 12:05:13+01:00, msvensson@stripped +3 -3
    Import patch yassl.diff

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug26678/my50-bug26678

--- 1.16/extra/yassl/taocrypt/include/misc.hpp	2006-10-05 23:32:32 +02:00
+++ 1.17/extra/yassl/taocrypt/include/misc.hpp	2007-02-27 12:05:12 +01:00
@@ -858,9 +858,9 @@ inline T1 SaturatingSubtract(T1 a, T2 b)
 
 
 // declares
-unsigned int  BytePrecision(unsigned long value);
-unsigned int  BitPrecision(unsigned long);
-unsigned long Crop(unsigned long value, unsigned int size);
+unsigned int  BytePrecision(word value);
+unsigned int  BitPrecision(word);
+word Crop(word value, unsigned int size);
 
 
 

--- 1.19/extra/yassl/taocrypt/src/misc.cpp	2006-10-17 02:33:15 +02:00
+++ 1.20/extra/yassl/taocrypt/src/misc.cpp	2007-02-27 12:05:13 +01:00
@@ -122,7 +122,7 @@ void xorbuf(byte* buf, const byte* mask,
 }
 
 
-unsigned int BytePrecision(unsigned long value)
+unsigned int BytePrecision(word value)
 {
     unsigned int i;
     for (i=sizeof(value); i; --i)
@@ -133,7 +133,7 @@ unsigned int BytePrecision(unsigned long
 }
 
 
-unsigned int BitPrecision(unsigned long value)
+unsigned int BitPrecision(word value)
 {
     if (!value)
         return 0;
@@ -154,7 +154,7 @@ unsigned int BitPrecision(unsigned long 
 }
 
 
-unsigned long Crop(unsigned long value, unsigned int size)
+word Crop(word value, unsigned int size)
 {
     if (size < 8*sizeof(value))
         return (value & ((1L << size) - 1));