← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/csv/transparent_file.cc

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/csv/transparent_file.cc
35
35
  filedes= filedes_arg;
36
36
  /* read the beginning of the file */
37
37
  lower_bound= 0;
38
 
  VOID(my_seek(filedes, 0, MY_SEEK_SET, MYF(0)));
 
38
  my_seek(filedes, 0, MY_SEEK_SET, MYF(0));
39
39
  if (filedes && buff)
40
40
    upper_bound= my_read(filedes, buff, buff_size, MYF(0));
41
41
}
85
85
  if ((lower_bound <= offset) && (offset < upper_bound))
86
86
    return buff[offset - lower_bound];
87
87
 
88
 
  VOID(my_seek(filedes, offset, MY_SEEK_SET, MYF(0)));
 
88
  my_seek(filedes, offset, MY_SEEK_SET, MYF(0));
89
89
  /* read appropriate portion of the file */
90
90
  if ((bytes_read= my_read(filedes, buff, buff_size,
91
91
                           MYF(0))) == MY_FILE_ERROR)