← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_open.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_open.c
255
255
    stpcpy(share->index_file_name,  index_name);
256
256
    stpcpy(share->data_file_name,   data_name);
257
257
 
258
 
    share->blocksize=min(IO_SIZE,myisam_block_size);
 
258
    share->blocksize=cmin(IO_SIZE,myisam_block_size);
259
259
    {
260
260
      HA_KEYSEG *pos=share->keyparts;
261
261
      for (i=0 ; i < keys ; i++)
374
374
    share->base.margin_key_file_length=(share->base.max_key_file_length -
375
375
                                        (keys ? MI_INDEX_BLOCK_MARGIN *
376
376
                                         share->blocksize * keys : 0));
377
 
    share->blocksize=min(IO_SIZE,myisam_block_size);
 
377
    share->blocksize=cmin(IO_SIZE,myisam_block_size);
378
378
    share->data_file_type=STATIC_RECORD;
379
379
    if (share->options & HA_OPTION_PACK_RECORD)
380
380
      share->data_file_type = DYNAMIC_RECORD;
558
558
    if (length == (ulong) -1)
559
559
    {
560
560
      if (info->s->options & HA_OPTION_COMPRESS_RECORD)
561
 
        length= max(info->s->base.pack_reclength, info->s->max_pack_length);
 
561
        length= cmax(info->s->base.pack_reclength, info->s->max_pack_length);
562
562
      else
563
563
        length= info->s->base.pack_reclength;
564
 
      length= max(length, info->s->base.max_key_length);
 
564
      length= cmax(length, info->s->base.max_key_length);
565
565
      /* Avoid unnecessary realloc */
566
566
      if (newptr && length == old_length)
567
567
        return newptr;