← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
783
783
 
784
784
 
785
785
  /* Set of a stack for unget if long terminators */
786
 
  uint32_t length= max(field_term_length,line_term_length)+1;
787
 
  set_if_bigger(length,line_start.length());
 
786
  size_t length= max(field_term_length,line_term_length)+1;
 
787
  set_if_bigger(length, line_start.length());
788
788
  stack= stack_pos= (int*) memory::sql_alloc(sizeof(int)*length);
789
789
 
790
790
  if (!(buffer=(unsigned char*) calloc(1, buff_length+1)))