~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-12-31 00:19:37 UTC
  • mto: (2060.4.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2073.
  • Revision ID: brian@tangent.org-20101231001937-7pf6rpw52w2qffch
Merge in local_instance change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
168
168
  lex(&main_lex),
169
169
  query(new std::string),
170
170
  _schema(new std::string("")),
171
 
  catalog("LOCAL"),
172
171
  client(client_arg),
173
172
  scheduler(NULL),
174
173
  scheduler_arg(NULL),