diff options
| author | unknown <serg@serg.mylan> | 2005-06-09 15:53:35 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-09 15:53:35 +0200 |
| commit | 9f326d6a66d40f8975cf0b802aacc5ae594dbbf4 (patch) | |
| tree | 67932f34d943007229ffaa4fc534c58ad7e1a131 /extra | |
| parent | baae624cdbdec0cc1342f02a205d32b07f096011 (diff) | |
| parent | 1438e06e3acc7558989d8b262c4c599df57ef645 (diff) | |
| download | mariadb-git-9f326d6a66d40f8975cf0b802aacc5ae594dbbf4.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/include/modes.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/include/modes.hpp b/extra/yassl/taocrypt/include/modes.hpp index 585231c9b9e..ccf6c08549f 100644 --- a/extra/yassl/taocrypt/include/modes.hpp +++ b/extra/yassl/taocrypt/include/modes.hpp @@ -71,7 +71,7 @@ public: void SetIV(const byte* iv) { memcpy(reg_, iv, blockSz_); } private: - byte reg_[MaxBlockSz]; + byte __attribute__ ((aligned (sizeof(word32)))) reg_[MaxBlockSz]; byte tmp_[MaxBlockSz]; int blockSz_; |