List:Commits« Previous MessageNext Message »
From:Jorgen Loland Date:May 20 2011 2:17pm
Subject:Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800
View as plain text  
On 05/20/2011 03:17 PM, Guilhem Bichot wrote:
> Hello,
>
> Jorgen Loland a écrit, Le 19.05.2011 13:10:
>> Guilhem,
>>
>> You have my blessing on the security patch. The security checks look good, but
>> I'm trusting Dmitri's judgment on the correctness. A few notes:
>>
>> === modified file 'sql/sql_prepare.cc'
>> --- sql/sql_prepare.cc 2011-03-21 17:55:41 +0000
>> +++ sql/sql_prepare.cc 2011-05-05 11:28:31 +0000
>> @@ -2021,8 +2018,7 @@ static bool check_prepared_statement(Pre
>> if (res == 2)
>> {
>> /* Statement and field info has already been sent */
>> - res= FALSE;
>> - goto end;
>> + DBUG_RETURN(FALSE);
>>
>> jl: false
>
> In fact, I had changed this code in the past in this WL, but then noticed I
> didn't need the change, so reverted back to how it is in trunk. Which is why
> there is this old-looking FALSE.
> This way, the diff between wl4800 and trunk is only:

That's OK

-- 
Jørgen Løland | Senior Software Engineer | +47 73842138
Oracle MySQL
Trondheim, Norway
Thread
bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Tor Didriksen19 May
  • Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Jorgen Loland19 May
    • Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Jorgen Loland19 May
    • Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Guilhem Bichot20 May
      • Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Jorgen Loland20 May
  • Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Guilhem Bichot20 May
    • Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Tor Didriksen20 May
      • Re: bzr commit into mysql-trunk branch (tor.didriksen:3309) WL#4800Guilhem Bichot21 May