← 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-02-13 01:25:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2167.
  • Revision ID: brian@tangent.org-20110213012500-w094udxhtye5unik
Remove dependency from session of error handler

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
57
57
#include <drizzled/select_max_min_finder_subselect.h>
58
58
#include <drizzled/select_exists_subselect.h>
59
59
#include <drizzled/tmp_table_param.h>
 
60
#include <drizzled/internal_error_handler.h>
60
61
 
61
62
#include "drizzled/identifier.h"
62
63
 
347
348
  m_internal_handler= NULL;
348
349
}
349
350
 
350
 
void Session::get_xid(DRIZZLE_XID *xid)
 
351
void Session::get_xid(DrizzleXid *xid)
351
352
{
352
 
  *xid = *(DRIZZLE_XID *) &transaction.xid_state.xid;
 
353
  *xid = *(DrizzleXid *) &transaction.xid_state.xid;
353
354
}
354
355
 
355
356
/* Do operations that may take a long time */