← Back to team overview

maria-developers team mailing list archive

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

 

Hi!

>>>>> "knielsen" == knielsen  <knielsen@xxxxxxxxxxxxxxx> writes:

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

knielsen> === modified file 'sql/mysqld.cc'
knielsen> --- a/sql/mysqld.cc	2009-10-02 11:09:01 +0000
knielsen> +++ b/sql/mysqld.cc	2009-10-07 13:07:10 +0000
knielsen> @@ -8429,7 +8429,7 @@ mysqld_get_one_option(int optid,
knielsen>      break;
knielsen>    case OPT_LOG_SLOW_FILTER:
knielsen>      global_system_variables.log_slow_filter=
knielsen> -      find_bit_type_or_exit(argument, &log_slow_verbosity_typelib,
knielsen> +      find_bit_type_or_exit(argument, &log_slow_filter_typelib,
knielsen>                              opt->name, &error);
knielsen>      /*
knielsen>        If we are using filters, we set opt_slow_admin_statements to be always
knielsen> @@ -8441,7 +8441,7 @@ mysqld_get_one_option(int optid,
knielsen>      break;
knielsen>    case OPT_LOG_SLOW_VERBOSITY:
knielsen>      global_system_variables.log_slow_verbosity=
knielsen> -      find_bit_type_or_exit(argument, &log_slow_filter_typelib,
knielsen> +      find_bit_type_or_exit(argument, &log_slow_verbosity_typelib,
knielsen>                              opt->name, &error);
knielsen>      if (error)
knielsen>        return 1;

Good catch.

Apparenty I forgot to add a test for setting these when I wrote the
code :(

Regards,
Monty



Follow ups

References