← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_create.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_create.c
354
354
    block_length= (keydef->block_length ? 
355
355
                   my_round_up_to_next_power(keydef->block_length) :
356
356
                   myisam_block_size);
357
 
    block_length= max(block_length, MI_MIN_KEY_BLOCK_LENGTH);
358
 
    block_length= min(block_length, MI_MAX_KEY_BLOCK_LENGTH);
 
357
    block_length= cmax(block_length, MI_MIN_KEY_BLOCK_LENGTH);
 
358
    block_length= cmin(block_length, MI_MAX_KEY_BLOCK_LENGTH);
359
359
 
360
360
    keydef->block_length= (uint16_t) MI_BLOCK_SIZE(length-real_length_diff,
361
361
                                                 pointer,MI_MAX_KEYPTR_SIZE,
443
443
    got from MYI file header (see also myisampack.c:save_state)
444
444
  */
445
445
  share.base.key_reflength=
446
 
    mi_get_pointer_length(max(ci->key_file_length,tmp),3);
 
446
    mi_get_pointer_length(cmax(ci->key_file_length,tmp),3);
447
447
  share.base.keys= share.state.header.keys= keys;
448
448
  share.state.header.uniques= uniques;
449
449
  share.state.header.fulltext_keys= fulltext_keys;
476
476
  share.base.min_block_length=
477
477
    (share.base.pack_reclength+3 < MI_EXTEND_BLOCK_LENGTH &&
478
478
     ! share.base.blobs) ?
479
 
    max(share.base.pack_reclength,MI_MIN_BLOCK_LENGTH) :
 
479
    cmax(share.base.pack_reclength,MI_MIN_BLOCK_LENGTH) :
480
480
    MI_EXTEND_BLOCK_LENGTH;
481
481
  if (! (flags & HA_DONT_TOUCH_DATA))
482
482
    share.state.create_time= (long) time((time_t*) 0);