← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
24
24
#include <drizzled/sql_base.h>
25
25
#include <drizzled/field/timestamp.h>
26
26
 
 
27
#include <algorithm>
 
28
 
 
29
using namespace std;
 
30
 
27
31
class READ_INFO {
28
32
  File  file;
29
33
  unsigned char *buffer;                /* Buffer for read text */
761
765
 
762
766
 
763
767
  /* Set of a stack for unget if long terminators */
764
 
  uint32_t length=cmax(field_term_length,line_term_length)+1;
 
768
  uint32_t length= max(field_term_length,line_term_length)+1;
765
769
  set_if_bigger(length,line_start.length());
766
 
  stack=stack_pos=(int*) sql_alloc(sizeof(int)*length);
 
770
  stack= stack_pos= (int*) sql_alloc(sizeof(int)*length);
767
771
 
768
772
  if (!(buffer=(unsigned char*) calloc(1, buff_length+1)))
769
773
    error=1; /* purecov: inspected */