← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.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/sql_load.cc
772
772
  set_if_bigger(length,line_start.length());
773
773
  stack=stack_pos=(int*) sql_alloc(sizeof(int)*length);
774
774
 
775
 
  if (!(buffer=(unsigned char*) my_malloc(buff_length+1,MYF(0))))
 
775
  if (!(buffer=(unsigned char*) malloc(buff_length+1)))
776
776
    error=1; /* purecov: inspected */
777
777
  else
778
778
  {