← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/ha_trx_info.cc

  • Committer: Brian Aker
  • Date: 2009-03-25 22:03:13 UTC
  • mfrom: (960.2.47 mordred)
  • Revision ID: brian@tangent.org-20090325220313-fffae098oufxiaqg
Merge of Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/ha_trx_info.cc
19
19
 
20
20
#include <drizzled/server_includes.h>
21
21
#include <drizzled/ha_trx_info.h>
22
 
#include <drizzled/handlerton.h>
 
22
#include <drizzled/plugin/storage_engine.h>
23
23
#include <drizzled/session.h>
24
24
 
25
25
 
26
 
void Ha_trx_info::register_ha(Session_TRANS *trans, handlerton *ht_arg)
 
26
void Ha_trx_info::register_ha(Session_TRANS *trans, StorageEngine *engine_arg)
27
27
{
28
28
  assert(m_flags == 0);
29
 
  assert(m_ht == NULL);
 
29
  assert(m_engine == NULL);
30
30
  assert(m_next == NULL);
31
31
 
32
 
  m_ht= ht_arg;
 
32
  m_engine= engine_arg;
33
33
  m_flags= (int) TRX_READ_ONLY; /* Assume read-only at start. */
34
34
 
35
35
  m_next= trans->ha_list;
41
41
void Ha_trx_info::reset()
42
42
{
43
43
  m_next= NULL;
44
 
  m_ht= NULL;
 
44
  m_engine= NULL;
45
45
  m_flags= 0;
46
46
}
47
47
 
61
61
 
62
62
bool Ha_trx_info::is_started() const
63
63
{
64
 
  return m_ht != NULL;
 
64
  return m_engine != NULL;
65
65
}
66
66
 
67
67
 
86
86
}
87
87
 
88
88
 
89
 
handlerton *Ha_trx_info::ht() const
 
89
StorageEngine *Ha_trx_info::engine() const
90
90
{
91
91
  assert(is_started());
92
 
  return m_ht;
 
92
  return m_engine;
93
93
}