← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

MErge Session fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
190
190
  session_event_observers(NULL),
191
191
  use_usage(false)
192
192
{
193
 
  memset(process_list_info, 0, PROCESS_LIST_WIDTH);
194
193
  client->setSession(this);
195
194
 
196
195
  /*
713
712
    in_packet_length--;
714
713
  }
715
714
  const char *pos= in_packet + in_packet_length; /* Point at end null */
716
 
  while (in_packet_length > 0 &&
717
 
         (pos[-1] == ';' || my_isspace(charset() ,pos[-1])))
 
715
  while (in_packet_length > 0 && (pos[-1] == ';' || my_isspace(charset() ,pos[-1])))
718
716
  {
719
717
    pos--;
720
718
    in_packet_length--;
721
719
  }
722
720
 
723
 
  query.assign(in_packet, in_packet + in_packet_length);
 
721
  query.reset(new std::string(in_packet, in_packet + in_packet_length));
724
722
 
725
723
  return true;
726
724
}