← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to sql/discover.cc

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/discover.cc
82
82
  
83
83
 err:
84
84
  if (file > 0)
85
 
    VOID(my_close(file,MYF(MY_WME)));
 
85
    (void) my_close(file,MYF(MY_WME));
86
86
  
87
87
 err_end:                     /* Here when no file */
88
88
  DBUG_RETURN (error);
118
118
  {
119
119
    if (my_write(file, frmdata, len,MYF(MY_WME | MY_NABP)))
120
120
      error= 2;
121
 
    VOID(my_close(file,MYF(0)));
 
121
    (void) my_close(file,MYF(0));
122
122
  }
123
123
  DBUG_RETURN(error);
124
124
} /* writefrm */