← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Jay Pipes
  • Date: 2009-08-16 14:14:39 UTC
  • mfrom: (1100.3.35 cleanup-exec-command)
  • mto: This revision was merged to the branch mainline in revision 1117.
  • Revision ID: jpipes@serialcoder-20090816141439-6ltll44rh3kq7io5
Merge Padraig's continued cleanup of exec command classes plus a couple merge conflict resolutions...

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
173
173
 
174
174
Session::Session(plugin::Protocol *protocol_arg)
175
175
  :
176
 
  Statement(&main_lex, &main_mem_root, /* statement id */ 0),
177
176
  Open_tables_state(refresh_version),
 
177
  mem_root(&main_mem_root),
 
178
  lex(&main_lex),
 
179
  db(NULL),
178
180
  scheduler(NULL),
179
181
  scheduler_arg(NULL),
180
182
  lock_id(&main_lock_id),
276
278
  m_internal_handler= NULL;
277
279
}
278
280
 
279
 
void Statement::free_items()
 
281
void Session::free_items()
280
282
{
281
283
  Item *next;
282
284
  /* This works because items are allocated with sql_alloc() */