diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-30 12:51:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-30 14:11:59 +0300 |
| commit | f42a23178edee5dd1fb6e0f76bbe88ea2a98a045 (patch) | |
| tree | 471f5d552f9b285bf2ba5940854783ea3708bbdf /sql/field.h | |
| parent | a379f151b18e4bc7e4c26be5f5e1254a59e27bfa (diff) | |
| download | mariadb-git-f42a23178edee5dd1fb6e0f76bbe88ea2a98a045.tar.gz | |
MDEV-20425: Fix -Wimplicit-fallthrough
With --skip-debug-assert, DBUG_ASSERT(false) will allow execution to
continue. Hence, we will need /* fall through */ after them.
Some DBUG_ASSERT(0) were replaced by break; when the switch () statement
was followed by DBUG_ASSERT(0).
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 67e20c5a1b4..3228d51b748 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1,7 +1,7 @@ #ifndef FIELD_INCLUDED #define FIELD_INCLUDED /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2017, MariaDB Corporation. + Copyright (c) 2008, 2019, 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 @@ -461,6 +461,7 @@ inline bool is_temporal_type_with_date(enum_field_types type) case MYSQL_TYPE_DATETIME2: case MYSQL_TYPE_TIMESTAMP2: DBUG_ASSERT(0); // field->real_type() should not get to here. + /* fall through */ default: return false; } |