Post-merge fixes

extra/yassl/src/handshake.cpp

@@ -789,7 +789,7 @@ void processReply(SSL& ssl)
 {
     if (ssl.GetError()) return;
 
-    if (DoProcessReply(ssl)) {
+    if (DoProcessReply(ssl))
     {
         // didn't complete process
         if (!ssl.getSocket().IsNonBlocking()) {
@@ -874,7 +874,7 @@ void sendServerKeyExchange(SSL& ssl, BufferOutput buffer)
 // 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);

extra/yassl/src/yassl_imp.cpp

@@ -1305,7 +1305,6 @@ void ServerHello::Process(input_buffer&, SSL& ssl)
         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());

extra/yassl/taocrypt/include/modes.hpp

@@ -95,7 +95,7 @@ inline void Mode_BASE::Process(byte* out, const byte* in, word32 sz)
 {
     if (mode_ == ECB)
         ECB_Process(out, in, sz);
-    else if (mode_ == CBC) {
+    else if (mode_ == CBC)
     {
         if (dir_ == ENCRYPTION)
             CBC_Encrypt(out, in, sz);

extra/yassl/taocrypt/src/asn.cpp

@@ -1063,7 +1063,7 @@ word32 DecodeDSA_Signature(byte* decoded, const byte* encoded, word32 sz)
         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 @@ word32 DecodeDSA_Signature(byte* decoded, const byte* encoded, word32 sz)
         return 0;
     }
     word32 sLen = GetLength(source);
-    if (sLen != 20) {
+    if (sLen != 20)
     {
         if (sLen == 21) {
             source.next();          // zero at front, eat

storage/maria/ma_rt_index.c

@@ -1136,8 +1136,6 @@ my_bool maria_rtree_real_delete(MARIA_HA *info, MARIA_KEY *key,
     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;