← Back to team overview

maria-developers team mailing list archive

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2763)

 

#At lp:maria

 2763 knielsen@xxxxxxxxxxxxxxx	2009-10-07 [merge]
      Merge Arjen's fix for new slow log functionality.
      modified:
        sql/mysqld.cc

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-10-02 11:09:01 +0000
+++ b/sql/mysqld.cc	2009-10-07 13:07:10 +0000
@@ -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;




Follow ups