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 /client | |
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 'client')
-rw-r--r-- | client/mysql.cc | 2 | ||||
-rw-r--r-- | client/mysqldump.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 9c76e30d96f..2a56caf23ef 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1080,7 +1080,7 @@ static ulong start_timer(void); static void end_timer(ulong start_time,char *buff); static void mysql_end_timer(ulong start_time,char *buff); static void nice_time(double sec,char *buff,bool part_second); -extern "C" sig_handler mysql_end(int sig); +extern "C" sig_handler mysql_end(int sig) __attribute__ ((noreturn)); extern "C" sig_handler handle_sigint(int sig); #if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL) static sig_handler window_resize(int sig); diff --git a/client/mysqldump.c b/client/mysqldump.c index 2e3270a2fed..4e611ed5cb2 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2012,6 +2012,7 @@ static void print_xml_comment(FILE *xml_file, size_t len, case '-': if (*(comment_string + 1) == '-') /* Only one hyphen allowed. */ break; + /* fall through */ default: fputc(*comment_string, xml_file); break; |