← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Monty Taylor
  • Date: 2009-12-27 00:49:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1255.
  • Revision ID: mordred@inaugust.com-20091227004903-maw7ktxu6i6hye9b
Moved mem_root functions into drizzled::memory:: namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
32
32
#include <algorithm>
33
33
#include <climits>
34
34
 
 
35
using namespace drizzled;
35
36
using namespace std;
36
37
 
37
38
class READ_INFO {
775
776
  /* Set of a stack for unget if long terminators */
776
777
  uint32_t length= max(field_term_length,line_term_length)+1;
777
778
  set_if_bigger(length,line_start.length());
778
 
  stack= stack_pos= (int*) sql_alloc(sizeof(int)*length);
 
779
  stack= stack_pos= (int*) memory::sql_alloc(sizeof(int)*length);
779
780
 
780
781
  if (!(buffer=(unsigned char*) calloc(1, buff_length+1)))
781
782
    error=1;