diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-10-30 20:50:56 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-10-30 20:50:56 +0200 |
| commit | 226f0c7601a7bc3d0274d0b7aa6523743856cf11 (patch) | |
| tree | 35ea9501b4c40098ed9b57b42d44aa35d912dea7 /extra/yassl | |
| parent | 664fa25e0e40457f2374f4372fca9a631d039c8c (diff) | |
| download | mariadb-git-226f0c7601a7bc3d0274d0b7aa6523743856cf11.tar.gz | |
Added federatedx storage engine
Fixed compiler warnings
client/mysqladmin.cc:
Fixed compiler warning
extra/yassl/taocrypt/src/twofish.cpp:
Fixed compiler warning
libmysqld/Makefile.am:
Use federatedx instead of federated
(Should actually be removed)
mysql-test/mysql-test-run.pl:
Fixed warning
mysql-test/valgrind.supp:
Removed warning found on 64 bit Linux machine
storage/pbxt/src/cache_xt.cc:
Fixed compile warning
storage/xtradb/include/buf0buf.ic:
Fixed compiler warning
Diffstat (limited to 'extra/yassl')
| -rw-r--r-- | extra/yassl/taocrypt/src/twofish.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/src/twofish.cpp b/extra/yassl/taocrypt/src/twofish.cpp index 84dd35f9191..85feaa23280 100644 --- a/extra/yassl/taocrypt/src/twofish.cpp +++ b/extra/yassl/taocrypt/src/twofish.cpp @@ -55,6 +55,7 @@ void Twofish::Process(byte* out, const byte* in, word32 sz) in += BLOCK_SIZE; } else if (mode_ == CBC) + { if (dir_ == ENCRYPTION) while (blocks--) { r_[0] ^= *(word32*)in; @@ -82,6 +83,7 @@ void Twofish::Process(byte* out, const byte* in, word32 sz) out += BLOCK_SIZE; in += BLOCK_SIZE; } + } } #endif // DO_TWOFISH_ASM |