← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/csv/ha_tina.cc

  • Committer: Monty Taylor
  • Date: 2008-10-02 01:31:53 UTC
  • mfrom: (398.1.6 codestyle-new)
  • Revision ID: monty@inaugust.com-20081002013153-b097om921cd3j1pn
Merged from stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/csv/ha_tina.cc
1115
1115
  if (closest_hole == chain_ptr) /* no more chains */
1116
1116
    *end_pos= file_buff->end();
1117
1117
  else
1118
 
    *end_pos= min(file_buff->end(),
1119
 
                  closest_hole->begin);
 
1118
    *end_pos= std::min(file_buff->end(),
 
1119
                       closest_hole->begin);
1120
1120
  return (closest_hole != chain_ptr) && (*end_pos == closest_hole->begin);
1121
1121
}
1122
1122
 
1348
1348
  /* write repaired file */
1349
1349
  while (1)
1350
1350
  {
1351
 
    write_end= min(file_buff->end(), current_position);
 
1351
    write_end= std::min(file_buff->end(), current_position);
1352
1352
    if ((write_end - write_begin) &&
1353
1353
        (my_write(repair_file, (uchar*)file_buff->ptr(),
1354
1354
                  write_end - write_begin, MYF_RW)))