summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-10-07 15:15:59 +0200
committerunknown <knielsen@knielsen-hq.org>2009-10-07 15:15:59 +0200
commitfd3333c18b0c6c4c65f46f01966348caf90a4592 (patch)
tree7a15c1fe972d1cc04967e50eb815e81ba27b5c32
parente244cdaf0cddb21aab04b870b883b2ad177f39a2 (diff)
parent49e212374ef67390f1a6597fb4140c2d85754d3d (diff)
downloadmariadb-git-fd3333c18b0c6c4c65f46f01966348caf90a4592.tar.gz
Merge Arjen's fix for new slow log functionality.
-rw-r--r--sql/mysqld.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f4c6ae4d56a..114c07b2ca2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -8429,7 +8429,7 @@ mysqld_get_one_option(int optid,
break;
case OPT_LOG_SLOW_FILTER:
global_system_variables.log_slow_filter=
- find_bit_type_or_exit(argument, &log_slow_verbosity_typelib,
+ find_bit_type_or_exit(argument, &log_slow_filter_typelib,
opt->name, &error);
/*
If we are using filters, we set opt_slow_admin_statements to be always
@@ -8441,7 +8441,7 @@ mysqld_get_one_option(int optid,
break;
case OPT_LOG_SLOW_VERBOSITY:
global_system_variables.log_slow_verbosity=
- find_bit_type_or_exit(argument, &log_slow_filter_typelib,
+ find_bit_type_or_exit(argument, &log_slow_verbosity_typelib,
opt->name, &error);
if (error)
return 1;