← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/records.cc

  • Committer: Brian Aker
  • Date: 2008-12-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/records.cc
497
497
 
498
498
  // We have to allocate one more byte to use uint3korr (see comments for it)
499
499
  if (info->cache_records <= 2 ||
500
 
      !(info->cache=(unsigned char*) my_malloc_lock(rec_cache_size+info->cache_records*
501
 
                                           info->struct_length+1,
502
 
                                           MYF(0))))
 
500
      !(info->cache=(unsigned char*) malloc(rec_cache_size+info->cache_records*
 
501
                                            info->struct_length+1)))
503
502
    return(1);
504
503
#ifdef HAVE_purify
505
504
  // Avoid warnings in qsort