List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:April 2 2008 9:53am
Subject:Re: bk commit into 5.1 tree (sven:1.2552) BUG#34541
View as plain text  
Hi Sven!

Patch is approved. Since you have whitespace changes in the patch, could 
you please merge it to 6.0 so that I don't run into strange merge 
problems with merging with main.

Just my few cents,
Mats Kindahl

Sven Sandberg wrote:
> Below is the list of changes that have just been committed into a local
> 5.1 repository of sven.  When sven does a push these changes
> will be propagated to the main repository and, within 24 hours after the
> push, to the public repository.
> For information on how to access the public repository
> see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
>
> ChangeSet@stripped, 2008-04-02 16:49:22+07:00, sven@riska.(none) +7 -0
>   BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode
>   Problem: a typo in the code. When autocommit, foreign_key_checks,
>   sql_auto_is_null, or unique_checks changes, it prints "SET", and then a
>   comma-separated list of assignments. However, it does not print the
>   assignment to the @@autocommit variable.
>   Fix: print the @@autocommit variable.
>
>   
[snip]

> diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
> --- a/sql/log_event.cc	2008-03-07 19:59:33 +07:00
> +++ b/sql/log_event.cc	2008-04-02 16:49:18 +07:00
> @@ -2142,11 +2142,13 @@ void Query_log_event::print_query_header
>        bool need_comma= 0;
>        my_b_printf(file, "SET ");
>        print_set_option(file, tmp, OPTION_NO_FOREIGN_KEY_CHECKS, ~flags2,
> -                   "@@session.foreign_key_checks", &need_comma);
> +                       "@@session.foreign_key_checks", &need_comma);
>        print_set_option(file, tmp, OPTION_AUTO_IS_NULL, flags2,
> -                   "@@session.sql_auto_is_null", &need_comma);
> +                       "@@session.sql_auto_is_null", &need_comma);
>        print_set_option(file, tmp, OPTION_RELAXED_UNIQUE_CHECKS, ~flags2,
> -                   "@@session.unique_checks", &need_comma);
> +                       "@@session.unique_checks", &need_comma);
>   

Please avoid changing whitespace even if it is wrong. It has potential 
for causing merge problems if anybody does a real change to these lines.

> +      print_set_option(file, tmp, OPTION_NOT_AUTOCOMMIT, ~flags2,
> +                       "@@session.autocommit", &need_comma);
>        my_b_printf(file,"%s\n", print_event_info->delimiter);
>        print_event_info->flags2= flags2;
>      }
>
>   


-- 
Mats Kindahl
Lead Software Developer
Replication Team
MySQL AB, www.mysql.com


Thread
bk commit into 5.1 tree (sven:1.2552) BUG#34541Sven Sandberg2 Apr
  • Re: bk commit into 5.1 tree (sven:1.2552) BUG#34541Mats Kindahl2 Apr