← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Mark Atwood
  • Date: 2011-05-04 15:58:17 UTC
  • mfrom: (2281.4.14 prune)
  • Revision ID: me@mark.atwood.name-20110504155817-c5w3ak4w6olexmt2
merge lp:~olafvdspek/drizzle/prune

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
566
566
 
567
567
  mem_root->reset_root_defaults(variables.query_alloc_block_size,
568
568
                                variables.query_prealloc_size);
569
 
  transaction.xid_state.xid.null();
 
569
  transaction.xid_state.xid.set_null();
570
570
  transaction.xid_state.in_session=1;
571
571
  if (use_usage)
572
572
    resetUsage();