diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 8524d65..ced91bd 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -1425,8 +1425,9 @@ bool ha_federated::create_where_from_key(String *to,
           {
             goto err;
           }
+          break;
         }
-        break;
+        // fallthrough
       case HA_READ_KEY_OR_NEXT:
         DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
         if (emit_key_part_name(&tmp, key_part) ||
@@ -1444,8 +1445,9 @@ bool ha_federated::create_where_from_key(String *to,
               emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
                                     part_length))
             goto err;
+          break;
         }
-        break;
+        // fallthrough
       case HA_READ_KEY_OR_PREV:
         DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
         if (emit_key_part_name(&tmp, key_part) ||