References lp:1011983

Merged from codership-mysql/5.5 revision 3758

References lp:1011983
Merged from codership-mysql/5.5 revision 3758
f97e67ff · Seppo Jaakola · b96af9a3 · f97e67ff · f97e67ff
Commit f97e67ff authored Jun 13, 2012 by Seppo Jaakola
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.cc +2 -1

storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/ha_innodb.cc +2 -1

No files found.
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -7097,7 +7097,8 @@ ha_innobase::wsrep_append_keys(
 				DBUG_RETURN(rcode);
 			}
 		}
-	} else if (wsrep_protocol_version == 0) {
+	}
+	if (wsrep_protocol_version == 0) {
 		uint	len;
 		char 	keyval[WSREP_MAX_SUPPORTED_KEY_LENGTH+1] = {'\0'};
 		char 	*key 		= &keyval[0];

--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -7737,7 +7737,8 @@ ha_innobase::wsrep_append_keys(
 				DBUG_RETURN(rcode);
 			}
 		}
-	} else if (wsrep_protocol_version == 0) {
+	}
+	if (wsrep_protocol_version == 0) {
 		uint	len;
 		char 	keyval[WSREP_MAX_SUPPORTED_KEY_LENGTH+1] = {'\0'};
 		char 	*key 		= &keyval[0];