← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_iocache.cc

  • Committer: Monty Taylor
  • Date: 2008-12-07 23:42:51 UTC
  • mto: This revision was merged to the branch mainline in revision 670.
  • Revision ID: monty@inaugust.com-20081207234251-yxtbg06jpylwej29
Finally removed all of the my_malloc stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_iocache.cc
224
224
      if (type == SEQ_READ_APPEND)
225
225
        buffer_block *= 2;
226
226
      if ((info->buffer=
227
 
           (unsigned char*) my_malloc(buffer_block,
228
 
                             MYF((cache_myflags & ~ MY_WME) |
229
 
                                 (cachesize == min_cache ? MY_WME : 0)))) != 0)
 
227
           (unsigned char*) malloc(buffer_block)) != 0)
230
228
      {
231
229
        info->write_buffer=info->buffer;
232
230
        if (type == SEQ_READ_APPEND)
1789
1787
  char* block, *block_end;
1790
1788
  MY_INIT(argv[0]);
1791
1789
  max_block = cache_size*3;
1792
 
  if (!(block=(char*)my_malloc(max_block,MYF(MY_WME))))
 
1790
  if (!(block=(char*)malloc(max_block)))
1793
1791
    die("Not enough memory to allocate test block");
1794
1792
  block_end = block + max_block;
1795
1793
  for (p = block,i=0; p < block_end;i++)