summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-10-13 13:22:36 +0300
committerGeorgi Kodinov <kgeorge@mysql.com>2008-10-13 13:22:36 +0300
commit8bb2eb38f51ea214d10380fc9499087323ade62e (patch)
treedf97772b863141ca8f82e61efda0305cb02ebff2 /sql/mysqld.cc
parentb6704027d681a80be03d416e9c9c344d86a562dd (diff)
parent64191b6e688bf755b3e57562eeba1110e906c7b7 (diff)
downloadmariadb-git-8bb2eb38f51ea214d10380fc9499087323ade62e.tar.gz
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 76deffec789..abb778394e6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7675,8 +7675,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':
@@ -7847,8 +7845,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