1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixed a compilation warning
This commit is contained in:
Georgi Kodinov 2008-10-09 13:39:42 +03:00
parent c3296418e1
commit 0bc7aa2516
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@ -7665,8 +7665,6 @@ mysqld_get_one_option(int optid,
break; break;
case 'l': case 'l':
WARN_DEPRECATED(NULL, "7.0", "--log", "'--general_log'/'--general_log_file'"); WARN_DEPRECATED(NULL, "7.0", "--log", "'--general_log'/'--general_log_file'");
/* FALL-THROUGH */
case OPT_GENERAL_LOG_FILE:
opt_log=1; opt_log=1;
break; break;
case 'h': case 'h':
@ -7837,8 +7835,6 @@ mysqld_get_one_option(int optid,
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
case (int) OPT_SLOW_QUERY_LOG: case (int) OPT_SLOW_QUERY_LOG:
WARN_DEPRECATED(NULL, "7.0", "--log_slow_queries", "'--slow_query_log'/'--slow_query_log_file'"); 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; opt_slow_log= 1;
break; break;
#ifdef WITH_CSV_STORAGE_ENGINE #ifdef WITH_CSV_STORAGE_ENGINE

1
sql/sql_class.h
View File

@ -1010,6 +1010,7 @@ show_system_thread(enum_thread_type thread)
RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER); RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER);
} }
#undef RETURN_NAME_AS_STRING #undef RETURN_NAME_AS_STRING
return "UNKNOWN"; /* keep gcc happy */
} }
/** /**