Bug#25943754: FIX GCC 7 COMPILE WARNINGS

jhauglid · jhauglid · commit 670bd1db3384 · 2017-04-26T10:58:13.000+02:00
Fix new compilation warnings reported by GCC 7.
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -1254,6 +1254,7 @@ static Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *
         goto end;
       }
     }
+    // Fall through
     case binary_log::ROWS_QUERY_LOG_EVENT:
     case binary_log::WRITE_ROWS_EVENT:
     case binary_log::DELETE_ROWS_EVENT:
diff --git a/libbinlogevents/src/statement_events.cpp b/libbinlogevents/src/statement_events.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2016, 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
@@ -539,8 +539,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)
     {
diff --git a/rapid/plugin/x/mysqlxtest_src/common/utils_mysql_parsing.cc b/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.
             {
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
@@ -1140,6 +1140,7 @@ static bool maxmin_in_range(bool max_fl, Item_field *item_field, Item *cond)
   case Item_func::LT_FUNC:
   case Item_func::LE_FUNC:
     less_fl= true;
+    // Fall through
   case Item_func::GT_FUNC:
   case Item_func::GE_FUNC:
   {
diff --git a/sql/sp.cc b/sql/sp.cc
@@ -2653,6 +2653,7 @@ String *sp_get_item_value(THD *thd, Item *item, String *str)
     if (item->data_type() != MYSQL_TYPE_BIT)
       return item->val_str(str);
     else {/* Bit type is handled as binary string */}
+    // Fall through
   case STRING_RESULT:
     {
       String *result= item->val_str(str);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -3345,6 +3345,7 @@ mysql_execute_command(THD *thd, bool first_level)
       DBUG_PRINT("debug", ("Just after generate_incident()"));
     }
 #endif
+    // Fall through
   case SQLCOM_INSERT:
   case SQLCOM_REPLACE_SELECT:
   case SQLCOM_INSERT_SELECT:
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
@@ -661,6 +661,7 @@ class Show_create_error_handler : public Internal_error_handler
         is_handled= false;
         break;
       }
+      // Fall through
     case ER_COLUMNACCESS_DENIED_ERROR:
     // ER_VIEW_NO_EXPLAIN cannot happen here.
     case ER_PROCACCESS_DENIED_ERROR:
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
@@ -1441,8 +1441,8 @@ bool ha_federated::create_where_from_key(String *to,
           {
             goto err;
           }
-          break;
         }
+        break;
       case HA_READ_KEY_OR_NEXT:
         DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
         if (emit_key_part_name(&tmp, key_part) ||
@@ -1460,8 +1460,8 @@ bool ha_federated::create_where_from_key(String *to,
               emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
                                     part_length))
             goto err;
-          break;
         }
+        break;
       case HA_READ_KEY_OR_PREV:
         DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
         if (emit_key_part_name(&tmp, key_part) ||
diff --git a/storage/innobase/data/data0type.cc b/storage/innobase/data/data0type.cc
@@ -222,6 +222,7 @@ dtype_print(
 
 	case DATA_VAR_POINT:
 		fputs("DATA_VAR_POINT", stderr);
+		break;
 
 	case DATA_GEOMETRY:
 		fputs("DATA_GEOMETRY", stderr);
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
@@ -8753,6 +8753,7 @@ fil_tablespace_name_recover(
 	case MLOG_FILE_CREATE2:
 
 		ut_a(page_id.space() != TRX_SYS_SPACE);
+		// Fall through.
 
 	case MLOG_FILE_OPEN:
 
diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -1308,8 +1308,8 @@ buf_page_release_zip(
 			rw_lock_s_unlock(&block->debug_latch);
 		}
 	}
-		/* Fall through */
 #endif /* UNIV_DEBUG */
+		/* Fall through */
 
 	case BUF_BLOCK_ZIP_PAGE:
 	case BUF_BLOCK_ZIP_DIRTY:
diff --git a/storage/innobase/include/page0zip.ic b/storage/innobase/include/page0zip.ic
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2005, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -142,7 +142,7 @@ page_zip_rec_needs_ext(
 	ulint			n_fields,
 	const page_size_t&	page_size)
 {
-	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(comp || !page_size.is_compressed());
 
 #if UNIV_PAGE_SIZE_MAX > REC_MAX_DATA_SIZE
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
@@ -2075,6 +2075,7 @@ PageConverter::update_page(
 	case FIL_PAGE_TYPE_XDES:
 		err = set_current_xdes(
 			block->page.id.page_no(), get_frame(block));
+		/* Fall through. */
 	case FIL_PAGE_INODE:
 	case FIL_PAGE_TYPE_TRX_SYS:
 	case FIL_PAGE_IBUF_FREE_LIST:
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc
@@ -2040,6 +2040,7 @@ row_log_table_apply_update(
 
 		When applying the subsequent ROW_T_DELETE, no matching
 		record will be found. */
+		/* Fall through. */
 	case DB_SUCCESS:
 		ut_ad(row != NULL);
 		break;
diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc
@@ -320,9 +320,9 @@ trx_rseg_create(
 		|| rseg_id < srv_tmp_rollback_segments);
 	ut_ad(fsp_is_system_temporary(space_id)
 		|| rseg_id < srv_rollback_segments);
-	ut_ad(to_int(space->purpose) == fsp_is_system_temporary(space_id)
+	ut_ad(to_int(space->purpose) == (fsp_is_system_temporary(space_id)
 				? FIL_TYPE_TEMPORARY
-				: FIL_TYPE_TABLESPACE);
+				: FIL_TYPE_TABLESPACE));
 	ut_ad(univ_page_size.equals_to(page_size_t(space->flags)));
 
 	if (fsp_is_system_temporary(space_id)) {
diff --git a/storage/myisam/mi_panic.c b/storage/myisam/mi_panic.c
@@ -65,6 +65,7 @@ int mi_panic(enum ha_panic_function flag)
 	if (mi_lock_database(info,F_UNLCK))
 	  error=my_errno();
       }
+      break;
     case HA_PANIC_READ:			/* Restore to before WRITE */
       if (info->was_locked)
       {
diff --git a/unittest/gunit/json_binary-t.cc b/unittest/gunit/json_binary-t.cc
@@ -984,7 +984,9 @@ TEST_P(SpaceNeededTest, SpaceNeeded)
     value can be inlined in the large storage format.
   */
   if (param.m_needed_small != param.m_needed_large)
+  {
     EXPECT_EQ(0U, param.m_needed_large);
+  }
 
   size_t needed= 0;
   if (param.m_result)
diff --git a/unittest/gunit/json_dom-t.cc b/unittest/gunit/json_dom-t.cc
@@ -674,7 +674,9 @@ static void verify_binary_diffs(Field_json *field,
       or adjacent areas.
     */
     if (prev != nullptr)
+    {
       EXPECT_LT(prev->offset() + prev->length(), diff.offset());
+    }
     prev= &diff;
   }
   EXPECT_EQ(0, std::memcmp(buffer.get(), updated.ptr(), updated.length()));

Original file line number	Diff line number	Diff line change
`@@ -1254,6 +1254,7 @@ static Exit_status process_event(PRINT_EVENT_INFO print_event_info, Log_event `
`1254`	`1254`	`goto end;`
`1255`	`1255`	`}`
`1256`	`1256`	`}`
	`1257`	`+ // Fall through`
`1257`	`1258`	`case binary_log::ROWS_QUERY_LOG_EVENT:`
`1258`	`1259`	`case binary_log::WRITE_ROWS_EVENT:`
`1259`	`1260`	`case binary_log::DELETE_ROWS_EVENT:`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* This program is free software; you can redistribute it and/or`
`5`	`5`	`* modify it under the terms of the GNU General Public License as`
`@@ -118,8 +118,8 @@ namespace shcore`
`118`	`118`	`if (!is_hidden_command && !have_content)`
`119`	`119`	`head = tail; // Skip over the comment.`
`120`	`120`
`121`		`- break;`
`122`	`121`	`}`
	`122`	`+ break;`
`123`	`123`
`124`	`124`	`case '-': // Possible single line comment.`
`125`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1140,6 +1140,7 @@ static bool maxmin_in_range(bool max_fl, Item_field item_field, Item cond)`
`1140`	`1140`	`case Item_func::LT_FUNC:`
`1141`	`1141`	`case Item_func::LE_FUNC:`
`1142`	`1142`	`less_fl= true;`
	`1143`	`+ // Fall through`
`1143`	`1144`	`case Item_func::GT_FUNC:`
`1144`	`1145`	`case Item_func::GE_FUNC:`
`1145`	`1146`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2653,6 +2653,7 @@ String sp_get_item_value(THD thd, Item item, String str)`
`2653`	`2653`	`if (item->data_type() != MYSQL_TYPE_BIT)`
`2654`	`2654`	`return item->val_str(str);`
`2655`	`2655`	`else {/* Bit type is handled as binary string */}`
	`2656`	`+ // Fall through`
`2656`	`2657`	`case STRING_RESULT:`
`2657`	`2658`	`{`
`2658`	`2659`	`String *result= item->val_str(str);`
Original file line number	Diff line number	Diff line change
`@@ -3345,6 +3345,7 @@ mysql_execute_command(THD *thd, bool first_level)`
`3345`	`3345`	`DBUG_PRINT("debug", ("Just after generate_incident()"));`
`3346`	`3346`	`}`
`3347`	`3347`	`#endif`
	`3348`	`+ // Fall through`
`3348`	`3349`	`case SQLCOM_INSERT:`
`3349`	`3350`	`case SQLCOM_REPLACE_SELECT:`
`3350`	`3351`	`case SQLCOM_INSERT_SELECT:`
Original file line number	Diff line number	Diff line change
`@@ -661,6 +661,7 @@ class Show_create_error_handler : public Internal_error_handler`
`661`	`661`	`is_handled= false;`
`662`	`662`	`break;`
`663`	`663`	`}`
	`664`	`+ // Fall through`
`664`	`665`	`case ER_COLUMNACCESS_DENIED_ERROR:`
`665`	`666`	`// ER_VIEW_NO_EXPLAIN cannot happen here.`
`666`	`667`	`case ER_PROCACCESS_DENIED_ERROR:`
Original file line number	Diff line number	Diff line change
`@@ -1441,8 +1441,8 @@ bool ha_federated::create_where_from_key(String *to,`
`1441`	`1441`	`{`
`1442`	`1442`	`goto err;`
`1443`	`1443`	`}`
`1444`		`- break;`
`1445`	`1444`	`}`
	`1445`	`+ break;`
`1446`	`1446`	`case HA_READ_KEY_OR_NEXT:`
`1447`	`1447`	`DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));`
`1448`	`1448`	`if (emit_key_part_name(&tmp, key_part) \|\|`
`@@ -1460,8 +1460,8 @@ bool ha_federated::create_where_from_key(String *to,`
`1460`	`1460`	`emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,`
`1461`	`1461`	`part_length))`
`1462`	`1462`	`goto err;`
`1463`		`- break;`
`1464`	`1463`	`}`
	`1464`	`+ break;`
`1465`	`1465`	`case HA_READ_KEY_OR_PREV:`
`1466`	`1466`	`DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));`
`1467`	`1467`	`if (emit_key_part_name(&tmp, key_part) \|\|`