← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/myisamchk.cc

  • Committer: Monty Taylor
  • Date: 2008-12-06 07:22:02 UTC
  • mto: (656.1.7 devel) (660.1.5 codestyle)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: monty@inaugust.com-20081206072202-2g25o9doqr1l8euu
OOOh doggie. Got rid of my_alloca.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisamchk.cc
1451
1451
    goto err;
1452
1452
  info->opt_flag|=WRITE_CACHE_USED;
1453
1453
 
1454
 
  if (!(temp_buff=(unsigned char*) my_alloca((uint) keyinfo->block_length)))
 
1454
  if (!(temp_buff=(unsigned char*) malloc(keyinfo->block_length)))
1455
1455
  {
1456
1456
    mi_check_print_error(param,"Not enough memory for key block");
1457
1457
    goto err;
1546
1546
  }
1547
1547
  if (temp_buff)
1548
1548
  {
1549
 
    my_afree((unsigned char*) temp_buff);
 
1549
    free((unsigned char*) temp_buff);
1550
1550
  }
1551
1551
  void * rec_buff_ptr= mi_get_rec_buff_ptr(info, sort_param.record);
1552
1552
  if (rec_buff_ptr != NULL)
1582
1582
 
1583
1583
  if (nod_flag)
1584
1584
  {
1585
 
    if (!(temp_buff=(unsigned char*) my_alloca((uint) keyinfo->block_length)))
 
1585
    if (!(temp_buff=(unsigned char*) malloc(keyinfo->block_length)))
1586
1586
    {
1587
1587
      mi_check_print_error(param,"Not Enough memory");
1588
1588
      return(-1);
1642
1642
    goto err;
1643
1643
  }
1644
1644
  if (temp_buff)
1645
 
    my_afree((unsigned char*) temp_buff);
 
1645
    free((unsigned char*) temp_buff);
1646
1646
  return(0);
1647
1647
err:
1648
1648
  if (temp_buff)
1649
 
    my_afree((unsigned char*) temp_buff);
 
1649
    free((unsigned char*) temp_buff);
1650
1650
  return(1);
1651
1651
} /* sort_record_index */
1652
1652