← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Jay Pipes
  • Date: 2010-01-12 16:44:32 UTC
  • mfrom: (1263 build)
  • mto: This revision was merged to the branch mainline in revision 1270.
  • Revision ID: jpipes@serialcoder-20100112164432-jra09ki86hf2mmli
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
409
409
      assert(end >= str);
410
410
 
411
411
      if (!(start= (char*) lip->m_session->alloc((uint32_t) (end-str)+1)))
412
 
        return (char*) "";              // Sql_alloc has set error flag
 
412
        return (char*) "";              // memory::SqlAlloc has set error flag
413
413
 
414
414
      lip->m_cpp_text_start= lip->get_cpp_tok_start() + pre_skip;
415
415
      lip->m_cpp_text_end= lip->get_cpp_ptr() - post_skip;