← 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 Monty

On 08/10/2009, at 8:43 PM, Michael Widenius wrote:
"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 :(


Indeed, I broke it by accident and thus found the problem.

There is actually more wrong, namely the --help --verbose help texts.
I don't think you updated those with your changes/additions compared to the microslow v1 patch you used as a base.

If you can find your original commit for this you might want to go over that clean chunk again to make sure it's complete and consistent. I didn't have the time to find it in the history and it's rather more difficult to spot potential issues in the big source.


Cheers,
Arjen.
--
Arjen Lentz, Exec.Director @ Open Query (http://openquery.com)
Exceptional Services for MySQL at a fixed budget.

Follow our blog at http://openquery.com/blog/
OurDelta: enhanced builds for MySQL @ http://ourdelta.org











Follow ups

References