diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-16 14:52:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 07:37:39 +0200 |
| commit | d76f5774fe70c51577cfbfdddcbfb3309d51f06e (patch) | |
| tree | 579994269a0b9d569e0ac2b4ca024e8027dc4551 /storage/innobase/include | |
| parent | 3b7aa3017b65dcf11d33617e954e1cb471703582 (diff) | |
| download | mariadb-git-d76f5774fe70c51577cfbfdddcbfb3309d51f06e.tar.gz | |
MDEV-13459 Warnings, when compiling with gcc-7.x
mostly caused by -Wimplicit-fallthrough
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/data0type.ic | 2 | ||||
| -rw-r--r-- | storage/innobase/include/page0zip.ic | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic index 410970ac50e..515b6b249ef 100644 --- a/storage/innobase/include/data0type.ic +++ b/storage/innobase/include/data0type.ic @@ -477,7 +477,7 @@ dtype_get_fixed_size_low( #else /* !UNIV_HOTBACKUP */ return(len); #endif /* !UNIV_HOTBACKUP */ - /* fall through for variable-length charsets */ + /* fall through */ /* for variable-length charsets */ case DATA_VARCHAR: case DATA_BINARY: case DATA_DECIMAL: diff --git a/storage/innobase/include/page0zip.ic b/storage/innobase/include/page0zip.ic index e26fa3e3d94..a2fa13c94df 100644 --- a/storage/innobase/include/page0zip.ic +++ b/storage/innobase/include/page0zip.ic @@ -170,7 +170,7 @@ page_zip_rec_needs_ext( ignored if zip_size == 0 */ ulint zip_size) /*!< in: compressed page size in bytes, or 0 */ { - ut_ad(rec_size > comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES); + ut_ad(rec_size > (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES)); ut_ad(ut_is_2pow(zip_size)); ut_ad(comp || !zip_size); |