[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2763)
#At lp:maria 2763 knielsen@knielsen-hq.org 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;
On Wed, Oct 7, 2009 at 4:16 PM, <knielsen@knielsen-hq.org> wrote:
#At lp:maria
2763 knielsen@knielsen-hq.org 2009-10-07 [merge] Merge Arjen's fix for new slow log functionality. modified: sql/mysqld.cc
Sorry to be a nitpick, but since this touches source code and not just build stuff... Arjen, could you please clarify the terms under which this fix are contributed to Monty Program (since we've discussed this earlier today, I'll omit the reasoning why this is necessary). -MCA (needs to be signed and faxed/emailed) -BSD (needs to be stated in the patch or email, etc...) or ...for this particular two liner fix, do you agree (please reply) that it does not constitute a copyrightable "work" in itself? (I don't know the English term, but means that trivial things are not "creative works" and thus not copyrightable.) henrik -- email: henrik.ingo@avoinelama.fi tel: +358-40-5697354 www: www.avoinelama.fi/~hingo book: www.openlife.cc
Hi!
"knielsen" == knielsen <knielsen@knielsen-hq.org> writes:
knielsen> #At lp:maria knielsen> 2763 knielsen@knielsen-hq.org 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
Hi Monty On 08/10/2009, at 8:43 PM, Michael Widenius wrote:
"knielsen" == knielsen <knielsen@knielsen-hq.org> writes:
knielsen> #At lp:maria knielsen> 2763 knielsen@knielsen-hq.org 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
Hi!
"Arjen" == Arjen Lentz <arjen@openquery.com> writes:
<cut>
Apparenty I forgot to add a test for setting these when I wrote the code :(
Arjen> Indeed, I broke it by accident and thus found the problem. Arjen> There is actually more wrong, namely the --help --verbose help texts. Arjen> I don't think you updated those with your changes/additions compared Arjen> to the microslow v1 patch you used as a base. Sorry, what do you mean ? Arjen> If you can find your original commit for this you might want to go Arjen> over that clean chunk again to make sure it's complete and consistent. Arjen> I didn't have the time to find it in the history and it's rather more Arjen> difficult to spot potential issues in the big source. I did go through the hunk in detail when I originally committed it. Without knowing what to look for, it will not help to go over it once more (by the same person). I just checked the help messages for log_slow_filter and log_slow_verbosity and they look fine. Regards, Monty
Hi Monty On 14/10/2009, at 2:13 AM, Michael Widenius wrote:
Arjen> There is actually more wrong, namely the --help --verbose help texts. Arjen> I don't think you updated those with your changes/additions compared Arjen> to the microslow v1 patch you used as a base.
Sorry, what do you mean ?
Arjen> If you can find your original commit for this you might want to go Arjen> over that clean chunk again to make sure it's complete and consistent. Arjen> I didn't have the time to find it in the history and it's rather more Arjen> difficult to spot potential issues in the big source.
I did go through the hunk in detail when I originally committed it. Without knowing what to look for, it will not help to go over it once more (by the same person).
I just checked the help messages for log_slow_filter and log_slow_verbosity and they look fine.
I think they're incomplete and possibly the default that's shown is wrong in the text. Just compare the option lists and the defaults with the text, that's all. 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
participants (4)
-
Arjen Lentz -
Henrik Ingo -
knielsen＠knielsen-hq.org -
Michael Widenius