← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Mark Atwood
  • Date: 2011-10-13 18:28:03 UTC
  • mfrom: (2433.1.5 rf1)
  • Revision ID: me@mark.atwood.name-20111013182803-pbmb3r5emfxfrbvy
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
169
169
 
170
170
  /* NOTE: utf_txt.length is in bytes, not in symbols. */
171
171
 
172
 
  memcpy(m_body_utf8_ptr, txt->str, txt->length);
173
 
  m_body_utf8_ptr += txt->length;
 
172
  memcpy(m_body_utf8_ptr, txt->data(), txt->size());
 
173
  m_body_utf8_ptr += txt->size();
174
174
  *m_body_utf8_ptr= 0;
175
175
 
176
176
  m_cpp_utf8_processed_ptr= end_ptr;