Re: bk commit into 5.1 tree (mats:1.2579) BUG#24860

[Sven Sandberg]

Hi Mats,

OK to push. I have one minor comment on style, see below.

/Sven


Mats Kindahl wrote:
[...]
> diff -Nrup a/sql/slave.cc b/sql/slave.cc
> --- a/sql/slave.cc	2007-10-13 14:58:06 +02:00
> +++ b/sql/slave.cc	2007-10-20 20:16:08 +02:00
[...]
> @@ -1953,15 +1964,19 @@ static int exec_relay_log_event(THD* thd
>                            "the slave_transaction_retries variable.",
>                            slave_trans_retries);
>        }
> -      else if (!((thd->options & OPTION_BEGIN) &&
> opt_using_transactions))
> +      else if (exec_res && !temp_err ||

For clarity, I would suggest parentheses around && inside || here.


-- 
Sven Sandberg, Software Engineer
MySQL AB, www.mysql.com