summaryrefslogtreecommitdiff
path: root/storage/heap
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-05-16 20:08:47 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-05-17 08:07:02 +0300
commit7972da8aa1c52121f60fb8fdae534a46892b4e07 (patch)
tree6d89e1eda68f52ad5e68deadc26aefe19a928866 /storage/heap
parent492c1e414564b4edc079b2eef7266e1cd551e91f (diff)
downloadmariadb-git-7972da8aa1c52121f60fb8fdae534a46892b4e07.tar.gz
Silence bogus GCC 7 warnings -Wimplicit-fallthrough
Do not silence uncertain cases, or fix any bugs. The only functional change should be that ha_federated::extra() is not calling DBUG_PRINT to report an unhandled case for HA_EXTRA_PREPARE_FOR_DROP.
Diffstat (limited to 'storage/heap')
-rw-r--r--storage/heap/hp_create.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c
index a68a35e63fb..d03c7c46f15 100644
--- a/storage/heap/hp_create.c
+++ b/storage/heap/hp_create.c
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
- Copyright (c) 2010, 2014, SkySQL Ab.
+ Copyright (c) 2010, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -94,7 +94,7 @@ int heap_create(const char *name, HP_CREATE_INFO *create_info,
case HA_KEYTYPE_VARBINARY1:
/* Case-insensitiveness is handled in coll->hash_sort */
keyinfo->seg[j].type= HA_KEYTYPE_VARTEXT1;
- /* fall_through */
+ /* fall through */
case HA_KEYTYPE_VARTEXT1:
keyinfo->flag|= HA_VAR_LENGTH_KEY;
length+= 2;