bzr commit into mysql-5.1 branch (kgeorge:2768)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/bzr/merge-5.1-bugteam/

 2768 Georgi Kodinov	2008-10-09
      WL4403: --general_log and --slow_query_log don't turn on the logging.
      Fixed a compilation warning
modified:
  sql/mysqld.cc
  sql/sql_class.h

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-10-07 09:50:57 +0000
+++ b/sql/mysqld.cc	2008-10-09 10:39:42 +0000
@@ -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

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2008-10-08 15:04:36 +0000
+++ b/sql/sql_class.h	2008-10-09 10:39:42 +0000
@@ -1010,6 +1010,7 @@ show_system_thread(enum_thread_type thre
     RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER);
   }
 #undef RETURN_NAME_AS_STRING
+  return "UNKNOWN"; /* keep gcc happy */
 }
 
 /**