diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5c64f3f866d..d59ea8eca45 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7665,8 +7665,6 @@ mysqld_get_one_option(int optid,
     break;
   case 'l':
     WARN_DEPRECATED(NULL, "7.0", "--log", "'--general_log'/'--general_log_file'");
-    /* FALL-THROUGH */
-  case OPT_GENERAL_LOG_FILE:
     opt_log=1;
     break;
   case 'h':
@@ -7837,8 +7835,6 @@ mysqld_get_one_option(int optid,
 #endif /* HAVE_REPLICATION */
   case (int) OPT_SLOW_QUERY_LOG:
     WARN_DEPRECATED(NULL, "7.0", "--log_slow_queries", "'--slow_query_log'/'--slow_query_log_file'");
-    /* FALL-THROUGH */
-  case (int) OPT_SLOW_QUERY_LOG_FILE:
     opt_slow_log= 1;
     break;
 #ifdef WITH_CSV_STORAGE_ENGINE
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 0f14e282294..7696882bbcc 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1010,6 +1010,7 @@ show_system_thread(enum_thread_type thread)
     RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER);
   }
 #undef RETURN_NAME_AS_STRING
+  return "UNKNOWN"; /* keep gcc happy */
 }
 
 /**