← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-75

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Continuous Integration
  • Date: 2012-08-01 19:07:25 UTC
  • mfrom: (2560.1.4 rf0)
  • Revision ID: ci@drizzle.org-20120801190725-vgjhdg17zp1ajbxr
Tags: 7.2.3
modified:
  drizzled/lex_input_stream.h
  drizzled/sql_lex.cc
  drizzled/sql_parse.cc
  drizzled/statement/execute.cc
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-05-31 Use str_ref

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
67
67
  list.link_in_list((unsigned char*) order, (unsigned char**) &order->next);
68
68
}
69
69
 
70
 
Lex_input_stream::Lex_input_stream(Session *session,
71
 
                                   const char* buffer,
72
 
                                   unsigned int length) :
73
 
  m_session(session),
 
70
Lex_input_stream::Lex_input_stream(Session& session, str_ref buffer) :
 
71
  m_session(&session),
74
72
  yylineno(1),
75
73
  yytoklen(0),
76
74
  yylval(NULL),
77
75
  lookahead_token(END_OF_INPUT),
78
76
  lookahead_yylval(NULL),
79
 
  m_ptr(buffer),
 
77
  m_ptr(buffer.data()),
80
78
  m_tok_start(NULL),
81
79
  m_tok_end(NULL),
82
 
  m_end_of_query(buffer + length),
 
80
  m_end_of_query(buffer.end()),
83
81
  m_tok_start_prev(NULL),
84
 
  m_buf(buffer),
85
 
  m_buf_length(length),
 
82
  m_buf(buffer.data()),
 
83
  m_buf_length(buffer.size()),
86
84
  m_echo(true),
87
85
  m_cpp_tok_start(NULL),
88
86
  m_cpp_tok_start_prev(NULL),
93
91
  ignore_space(1),
94
92
  in_comment(NO_COMMENT)
95
93
{
96
 
  m_cpp_buf= (char*) session->mem.alloc(length + 1);
 
94
  m_cpp_buf= (char*) session.mem.alloc(buffer.size() + 1);
97
95
  m_cpp_ptr= m_cpp_buf;
98
96
}
99
97