bk commit into 5.0 tree (svoj:1.1921)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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.1921 05/06/11 15:48:11 svoj@stripped +2 -0
  Merge

  extra/yassl/taocrypt/include/modes.hpp
    1.5 05/06/11 15:48:11 svoj@stripped +0 -0
    SCCS merged

  mysql-test/Makefile.am
    1.55 05/06/11 15:41:23 svoj@stripped +0 -0
    Auto merged

# 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:	svoj
# Host:	svoj.pils.ru
# Root:	/home/svoj/devel/mysql/merge-mysql-5.0/RESYNC

--- 1.4/extra/yassl/taocrypt/include/modes.hpp	2005-06-09 18:48:47 +05:00
+++ 1.5/extra/yassl/taocrypt/include/modes.hpp	2005-06-11 15:48:11 +05:00
@@ -60,7 +60,12 @@
 public:
     enum { MaxBlockSz = 16 };
 
-    explicit Mode_BASE(int sz) : blockSz_(sz) { assert(sz <= MaxBlockSz); }
+    explicit Mode_BASE(int sz) 
+        : blockSz_(sz), reg_(reinterpret_cast<byte*>(r_)),
+                        tmp_(reinterpret_cast<byte*>(t_))
+    { 
+        assert(sz <= MaxBlockSz);
+    }
     virtual ~Mode_BASE() {}
 
     virtual void ProcessAndXorBlock(const byte*, const byte*, byte*) const = 0;
@@ -71,9 +76,13 @@
 
     void SetIV(const byte* iv) { memcpy(reg_, iv, blockSz_); }
 private:
-    byte __attribute__ ((aligned (sizeof(word32)))) reg_[MaxBlockSz];
-    byte tmp_[MaxBlockSz];
-    int  blockSz_;
+    int   blockSz_;
+    byte* reg_;
+    byte* tmp_;
+
+    word32 r_[MaxBlockSz / sizeof(word32)];  // align reg_ on word32
+    word32 t_[MaxBlockSz / sizeof(word32)];  // align tmp_ on word32
+
 
     Mode_BASE(const Mode_BASE&);            // hide copy
     Mode_BASE& operator=(const Mode_BASE&); // and assign