At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/
------------------------------------------------------------
revno: 2734
revision-id: psergey@askmonty.org-20090915112239-pkxmusmef54rs7u4
parent: psergey@askmonty.org-20090915104635-bpj3pwfr05v9fjul
committer: Sergey Petrunya
branch nick: mysql-5.1-maria-contd3
timestamp: Tue 2009-09-15 15:22:39 +0400
message:
Post-merge fixes
=== modified file 'extra/yassl/src/handshake.cpp'
--- a/extra/yassl/src/handshake.cpp 2009-09-15 10:46:35 +0000
+++ b/extra/yassl/src/handshake.cpp 2009-09-15 11:22:39 +0000
@@ -789,7 +789,7 @@
{
if (ssl.GetError()) return;
- if (DoProcessReply(ssl)) {
+ if (DoProcessReply(ssl))
{
// didn't complete process
if (!ssl.getSocket().IsNonBlocking()) {
@@ -874,7 +874,7 @@
// send change cipher
void sendChangeCipher(SSL& ssl, BufferOutput buffer)
{
- if (ssl.getSecurity().get_parms().entity_ == server_end) {
+ if (ssl.getSecurity().get_parms().entity_ == server_end)
{
if (ssl.getSecurity().get_resuming())
ssl.verifyState(clientKeyExchangeComplete);
=== modified file 'extra/yassl/src/yassl_imp.cpp'
--- a/extra/yassl/src/yassl_imp.cpp 2009-09-15 10:46:35 +0000
+++ b/extra/yassl/src/yassl_imp.cpp 2009-09-15 11:22:39 +0000
@@ -1305,7 +1305,6 @@
ssl.useSecurity().use_connection().sessionID_Set_ = false;
if (ssl.getSecurity().get_resuming()) {
- {
if (memcmp(session_id_, ssl.getSecurity().get_resume().GetID(),
ID_LEN) == 0) {
ssl.set_masterSecret(ssl.getSecurity().get_resume().GetSecret());
=== modified file 'extra/yassl/taocrypt/include/modes.hpp'
--- a/extra/yassl/taocrypt/include/modes.hpp 2009-09-15 10:46:35 +0000
+++ b/extra/yassl/taocrypt/include/modes.hpp 2009-09-15 11:22:39 +0000
@@ -95,7 +95,7 @@
{
if (mode_ == ECB)
ECB_Process(out, in, sz);
- else if (mode_ == CBC) {
+ else if (mode_ == CBC)
{
if (dir_ == ENCRYPTION)
CBC_Encrypt(out, in, sz);
=== modified file 'extra/yassl/taocrypt/src/asn.cpp'
--- a/extra/yassl/taocrypt/src/asn.cpp 2009-09-15 10:46:35 +0000
+++ b/extra/yassl/taocrypt/src/asn.cpp 2009-09-15 11:22:39 +0000
@@ -1063,7 +1063,7 @@
return 0;
}
word32 rLen = GetLength(source);
- if (rLen != 20) {
+ if (rLen != 20)
{
if (rLen == 21) { // zero at front, eat
source.next();
@@ -1087,7 +1087,7 @@
return 0;
}
word32 sLen = GetLength(source);
- if (sLen != 20) {
+ if (sLen != 20)
{
if (sLen == 21) {
source.next(); // zero at front, eat
=== modified file 'storage/maria/ma_rt_index.c'
--- a/storage/maria/ma_rt_index.c 2009-09-15 10:46:35 +0000
+++ b/storage/maria/ma_rt_index.c 2009-09-15 11:22:39 +0000
@@ -1136,8 +1136,6 @@
uchar *page_buf;
MARIA_PAGE page;
MARIA_KEY tmp_key;
- uchar *page_buf;
- MARIA_PAGE page;
tmp_key.keyinfo= key->keyinfo;
tmp_key.data_length= key->data_length;
tmp_key.ref_length= key->ref_length;
Sergey Petrunya