← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2011-01-11 07:12:09 UTC
  • mfrom: (2068.5.6 catalogs)
  • Revision ID: brian@gir-3-20110111071209-ntbex8btgayoq00v
Merge in catalogs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
161
161
  return (enum_tx_isolation)session->variables.tx_isolation;
162
162
}
163
163
 
164
 
Session::Session(plugin::Client *client_arg) :
 
164
Session::Session(plugin::Client *client_arg, catalog::Instance::shared_ptr catalog_arg) :
165
165
  Open_tables_state(refresh_version),
166
166
  mem_root(&main_mem_root),
167
167
  xa_id(0),
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),
218
217
  transaction_message(NULL),
219
218
  statement_message(NULL),
220
219
  session_event_observers(NULL),
 
220
  _catalog(catalog_arg),
221
221
  use_usage(false)
222
222
{
223
223
  client->setSession(this);