Re: bzr commit into mysql-6.0-backup branch (Rafal.Somla:2740) Bug#35079 WL#4538

[Rafal Somla]

Forgot to say: thanks for helping me with investigating the issue on windows!

Rafal

Rafal Somla wrote:
> Hi Chuck,
> 
> I fixed the windows failure. Please review the new patch 
> <http://lists.mysql.com/commits/61517>
> 
> The problem was a missplaced error injection code in stream.cc. Instead 
> of this:
> 
>> @@ -249,6 +249,8 @@ int Stream::open()
>>  bool Stream::close()
>>  {
>>    bool ret= TRUE;
>> +
>> +  DBUG_EXECUTE_IF("backup_stream_close_error", { m_fd=-1; return 
>> FALSE; });
>>    if (m_fd >= 0)
>>    {
>>      if (my_close(m_fd, MYF(0)))
> 
> it should be rather this:
> 
>>    bool ret= TRUE;
>> +
>>    if (m_fd >= 0)
>>    {
>>      if (my_close(m_fd, MYF(0)))
>>      {
>>        ret= FALSE;
>>      }
>> +    DBUG_EXECUTE_IF("backup_stream_close_error", ret= FALSE;);
>>      m_fd= -1;
>>    }
> 
> So that the file is properly closed even if error injection code is 
> executed.
> 
> Rafal
> 
>