Bug#26825211 BACKPORT FIX FOR #25643811 TO 5.7

Backport relevant parts of patch for:
    Bug #25643811: MYSQL DOES NOT COMPILE WITH GCC 7

Change-Id: Iafc7bc70b3621e12b484694ff927fb15e21ac5d2

Author: Tor Didriksen

client/mysqlbinlog.cc

@@ -1310,8 +1310,6 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
       if (head->error == -1)
         goto err;
       break;
-      
-      destroy_evt= TRUE;
     }
 
     case binary_log::INTVAR_EVENT:
@@ -1536,6 +1534,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
         goto end;
       }
     }
+    // Fall through.
     case binary_log::ROWS_QUERY_LOG_EVENT:
     case binary_log::WRITE_ROWS_EVENT:
     case binary_log::DELETE_ROWS_EVENT:

client/mysqldump.c

@@ -2117,6 +2117,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;

cmake/maintainer.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # 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
@@ -16,6 +16,15 @@
 # Common warning flags for GCC, G++, Clang and Clang++
 SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security -Wvla")
 
+# The default =3 given by -Wextra is a bit too strict for our code.
+IF(CMAKE_COMPILER_IS_GNUCXX)
+  MY_CHECK_CXX_COMPILER_FLAG("-Wimplicit-fallthrough=2"
+    HAVE_IMPLICIT_FALLTHROUGH)
+  IF(HAVE_IMPLICIT_FALLTHROUGH)
+    SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wimplicit-fallthrough=2")
+  ENDIF()
+ENDIF()
+
 # Common warning flags for GCC and Clang
 SET(MY_C_WARNING_FLAGS
     "${MY_WARNING_FLAGS} -Wwrite-strings -Wdeclaration-after-statement")

extra/lz4/lz4frame.c

@@ -1091,6 +1091,7 @@ size_t LZ4F_decompress(LZ4F_decompressionContext_t decompressionContext,
                 dctxPtr->tmpInTarget = minFHSize;   /* minimum to attempt decode */
                 dctxPtr->dStage = dstage_storeHeader;
             }
+            // Fall through.
 
         case dstage_storeHeader:
             {

extra/replace.c

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -177,6 +177,7 @@ char **argv[];
 	break;
       case 'V':
 	version=1;
+        // Fall through.
       case 'I':
       case '?':
 	help=1;					/* Help text written */

libbinlogevents/src/binlog_event.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 
    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
@@ -169,7 +169,7 @@ Log_event_header(const char* buf, uint16_t binlog_version)
      extra_headers are not used in the current version.
     @endverbatim
    */
-
+    // Fall through.
   default:
     memcpy(&flags, buf + FLAGS_OFFSET, sizeof(flags));
     flags= le16toh(flags);

libbinlogevents/src/statement_events.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 
    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
@@ -532,8 +532,8 @@ User_var_event(const char* buf, unsigned int event_len,
                          (description_event->footer()->checksum_alg ==
                           BINLOG_CHECKSUM_ALG_OFF));
   size_t data_written= (header()->data_written- checksum_verify);
-  BAPI_ASSERT(((bytes_read == data_written) ? 0 : BINLOG_CHECKSUM_LEN)||
-              ((bytes_read == data_written - 1) ? 0 : BINLOG_CHECKSUM_LEN));
+  BAPI_ASSERT(((bytes_read == data_written) ? false : true) ||
+              ((bytes_read == data_written - 1) ? false : true));
 #endif
     if ((header()->data_written - bytes_read) > 0)
     {

libmysqld/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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
@@ -181,6 +181,16 @@ IF(HAVE_MISLEADING_INDENTATION)
     COMPILE_FLAGS "-Wno-misleading-indentation")
 ENDIF()
 
+# gcc 7.2.0 complains:
+# boost/geometry/algorithms/detail/expand/indexed.hpp:81
+# *((void*)& box +24) may be used uninitialized
+MY_CHECK_CXX_COMPILER_FLAG("-Wmaybe-uninitialized" HAVE_MAYBE_UNINITIALIZED)
+IF(HAVE_MAYBE_UNINITIALIZED)
+  ADD_COMPILE_FLAGS(
+    ../sql/geometry_rtree.cc
+    COMPILE_FLAGS "-Wno-maybe-uninitialized")
+ENDIF()
+
 # Handle out-of-source build from source package with possibly broken 
 # bison. Copy bison output to from source to build directory, if not already 
 # there

rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -118,8 +118,8 @@ namespace shcore
                 if (!is_hidden_command && !have_content)
                   head = tail; // Skip over the comment.
 
-                break;
               }
+              break;
 
             case '-': // Possible single line comment.
             {

rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.cc

@@ -557,6 +557,7 @@ void XProtocol::authenticate_mysql41(const std::string &user, const std::string
 
       case Mysqlx::ServerMessages::ERROR:
         throw_server_error(*static_cast<Mysqlx::Error*>(message.get()));
+        break;
 
       default:
         throw Error(CR_MALFORMED_PACKET, "Unexpected message received from server during authentication");
@@ -577,6 +578,7 @@ void XProtocol::authenticate_mysql41(const std::string &user, const std::string
 
       case Mysqlx::ServerMessages::ERROR:
         throw_server_error(*static_cast<Mysqlx::Error*>(message.get()));
+        break;
 
       case Mysqlx::ServerMessages::NOTICE:
         dispatch_notice(static_cast<Mysqlx::Notice::Frame*>(message.get()));
@@ -618,6 +620,7 @@ void XProtocol::authenticate_plain(const std::string &user, const std::string &p
 
       case Mysqlx::ServerMessages::ERROR:
         throw_server_error(*static_cast<Mysqlx::Error*>(message.get()));
+        break;
 
       case Mysqlx::ServerMessages::NOTICE:
         dispatch_notice(static_cast<Mysqlx::Notice::Frame*>(message.get()));