Commit ff3b5248 authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

WL4403: --general_log and --slow_query_log don't turn on the logging. 

Fixed a compilation warning
parent 5cbb580d

sql/mysqld.cc

+0 −4
Original line number Diff line number Diff line
@@ -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

sql/sql_class.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

}



/**