summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
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 /sql/mysqld.cc
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 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a8fef1bd8a3..0aa917cb7fe 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -8724,6 +8724,9 @@ mysql_getopt_value(const char *name, uint length,
return (uchar**) &key_cache->changed_blocks_hash_size;
}
}
+ /* We return in all cases above. Let us silence -Wimplicit-fallthrough */
+ DBUG_ASSERT(0);
+ /* fall through */
case OPT_REPLICATE_DO_DB:
case OPT_REPLICATE_DO_TABLE:
case OPT_REPLICATE_IGNORE_DB: