← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Olaf van der Spek
  • Date: 2011-10-14 10:07:18 UTC
  • mto: This revision was merged to the branch mainline in revision 2438.
  • Revision ID: olafvdspek@gmail.com-20111014100718-n1i5vtysh1gajn70
Use assign(), data() and size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
318
318
  lex_string_t tmp;
319
319
  tmp.assign((char*)lip->m_session->mem.alloc(length + 1), length);
320
320
  const char* from= lip->get_tok_start() + skip;
321
 
  char* to= (char*)tmp.str;
 
321
  char* to= (char*)tmp.data();
322
322
  const char* end= to+length;
323
323
 
324
324
  lip->m_cpp_text_start= lip->get_cpp_tok_start() + skip;
990
990
      }
991
991
      /* " used for strings */
992
992
    case MY_LEX_STRING:                 // Incomplete text string
993
 
      if (!(yylval->lex_str.str = get_text(lip, 1, 1)))
 
993
      if (!(yylval->lex_str.str_ = get_text(lip, 1, 1)))
994
994
      {
995
995
        state= MY_LEX_CHAR;             // Read char by char
996
996
        break;