Fix some -Wimplicit-fallthrough warnings in InnoDB

buf_read_ahead_linear(): Do not display a message if the tablespace is being deleted. dtype_print(): Add a missing break statement.
MariaDB · May 19, 2017 · 907cbad · 907cbad
1 parent 0bfa3df
commit 907cbad
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/storage/innobase/buf/buf0rea.cc b/storage/innobase/buf/buf0rea.cc
@@ -752,14 +752,9 @@ buf_read_ahead_linear(
 			switch (err) {
 			case DB_SUCCESS:
 			case DB_TABLESPACE_TRUNCATED:
+			case DB_TABLESPACE_DELETED:
 			case DB_ERROR:
 				break;
-			case DB_TABLESPACE_DELETED:
-				ib::info() << "linear readahead trying to"
-					" access page "
-					<< page_id_t(page_id.space(), i)
-					<< " in nonexisting or being-dropped"
-					" tablespace";
 			case DB_DECRYPTION_FAILED:
 				ib::error() << "linear readahead failed to"
 					" decrypt page "

diff --git a/storage/innobase/data/data0type.cc b/storage/innobase/data/data0type.cc
@@ -199,6 +199,7 @@ dtype_print(const dtype_t* type)
 
 	case DATA_VAR_POINT:
 		fputs("DATA_VAR_POINT", stderr);
+		break;
 
 	case DATA_GEOMETRY:
 		fputs("DATA_GEOMETRY", stderr);

diff --git a/storage/innobase/fts/fts0plugin.cc b/storage/innobase/fts/fts0plugin.cc
@@ -130,6 +130,7 @@ fts_query_add_word_for_parser(
 		if (cur_node->type != FTS_AST_PARSER_PHRASE_LIST) {
 			break;
 		}
+		/* fall through */
 
 	case FT_TOKEN_WORD:
 		term_node = fts_ast_create_node_term_for_parser(

diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
@@ -1286,9 +1286,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:
 		buf_block_unfix(reinterpret_cast<buf_block_t*>(bpage));

diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
@@ -2622,7 +2622,8 @@ srv_purge_should_exit(
 			/* Normal operation. */
 			break;
 		}
-		/* close_connections() was called; fall through */
+		/* close_connections() was called */
+		/* fall through */
 	case SRV_SHUTDOWN_CLEANUP:
 	case SRV_SHUTDOWN_EXIT_THREADS:
 		/* Exit unless slow shutdown requested or all done. */