← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Lee Bieber
  • Date: 2010-11-16 17:50:17 UTC
  • mfrom: (1932.3.2 trunk)
  • Revision ID: kalebral@gmail.com-20101116175017-sken3dkkpfcd2snv
Merge Brian - session fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
161
161
  mem_root(&main_mem_root),
162
162
  xa_id(0),
163
163
  lex(&main_lex),
 
164
  query(new std::string),
164
165
  catalog("LOCAL"),
165
166
  client(client_arg),
166
167
  scheduler(NULL),
190
191
  session_event_observers(NULL),
191
192
  use_usage(false)
192
193
{
193
 
  memset(process_list_info, 0, PROCESS_LIST_WIDTH);
194
194
  client->setSession(this);
195
195
 
196
196
  /*
713
713
    in_packet_length--;
714
714
  }
715
715
  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])))
 
716
  while (in_packet_length > 0 && (pos[-1] == ';' || my_isspace(charset() ,pos[-1])))
718
717
  {
719
718
    pos--;
720
719
    in_packet_length--;
721
720
  }
722
721
 
723
 
  query.assign(in_packet, in_packet + in_packet_length);
 
722
  query.reset(new std::string(in_packet, in_packet + in_packet_length));
724
723
 
725
724
  return true;
726
725
}