← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_check.c

  • Committer: Monty Taylor
  • Date: 2008-09-22 23:53:43 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: monty@inaugust.com-20080922235343-ihqvp6g9k1mtzxmc
Renamed max/min.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_check.c
1976
1976
  char tmp_buff[IO_SIZE],*buff;
1977
1977
  ulong buff_length;
1978
1978
 
1979
 
  buff_length=(ulong) min(param->write_buffer_length,length);
 
1979
  buff_length=(ulong) cmin(param->write_buffer_length,length);
1980
1980
  if (!(buff=my_malloc(buff_length,MYF(0))))
1981
1981
  {
1982
1982
    buff=tmp_buff; buff_length=IO_SIZE;
2130
2130
  sort_param.wordlist=NULL;
2131
2131
 
2132
2132
  if (share->data_file_type == DYNAMIC_RECORD)
2133
 
    length=max(share->base.min_pack_length+1,share->base.min_block_length);
 
2133
    length=cmax(share->base.min_pack_length+1,share->base.min_block_length);
2134
2134
  else if (share->data_file_type == COMPRESSED_RECORD)
2135
2135
    length=share->base.min_block_length;
2136
2136
  else
2537
2537
    my_seek(param->read_cache.file,0L,MY_SEEK_END,MYF(0));
2538
2538
 
2539
2539
  if (share->data_file_type == DYNAMIC_RECORD)
2540
 
    rec_length=max(share->base.min_pack_length+1,share->base.min_block_length);
 
2540
    rec_length=cmax(share->base.min_pack_length+1,share->base.min_block_length);
2541
2541
  else if (share->data_file_type == COMPRESSED_RECORD)
2542
2542
    rec_length=share->base.min_block_length;
2543
2543
  else
3778
3778
 
3779
3779
  VOID(mi_close(*org_info));
3780
3780
  memset(&create_info, 0, sizeof(create_info));
3781
 
  create_info.max_rows=max(max_records,share.base.records);
 
3781
  create_info.max_rows=cmax(max_records,share.base.records);
3782
3782
  create_info.reloc_rows=share.base.reloc;
3783
3783
  create_info.old_options=(share.options |
3784
3784
                           (unpack ? HA_OPTION_TEMP_COMPRESS_RECORD : 0));