summaryrefslogtreecommitdiff
path: root/storage/federated
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-08-17 11:32:16 +0200
committerSergei Golubchik <serg@mariadb.org>2017-08-17 11:38:34 +0200
commitcb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch)
tree29d130592e3dfea50251771979fbaa6923d44ba9 /storage/federated
parenta4885dde4ccec68bbb0268796f62e68e08ba4837 (diff)
parent48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff)
downloadmariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/ha_federated.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index ef48665d92a..8e8b39df2b2 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -1421,6 +1421,7 @@ bool ha_federated::create_where_from_key(String *to,
}
break;
}
+ /* fall through */
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) ||
@@ -1440,6 +1441,7 @@ bool ha_federated::create_where_from_key(String *to,
goto err;
break;
}
+ /* fall through */
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) ||