← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/ha_trx_info.h

  • Committer: Monty Taylor
  • Date: 2010-02-04 08:14:46 UTC
  • mfrom: (1277.2.1 build) (1280.2.1 build)
  • mto: This revision was merged to the branch mainline in revision 1283.
  • Revision ID: mordred@inaugust.com-20100204081446-ldh9m486va30uap6
Put everything in drizzled into drizzled namespace.
Put internal stuff into drizzled::internal namespace.
Removed some cruft.
Now every symbol that is shipped in a header is in the drizzled namespace
and everything in the server that's not shipped is labeled internal. woot. 
Removed a lot of the extra extern "C" stuff that was in there. Less ugliness for
internal callbacks now for Sun Studio.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/ha_trx_info.h
21
21
#define DRIZZLED_HA_TRX_INFO_H
22
22
 
23
23
 
 
24
namespace drizzled
 
25
{
 
26
 
24
27
class Session_TRANS;
25
 
namespace drizzled
26
 
{
27
28
namespace plugin
28
29
{
29
30
class StorageEngine;
30
31
}
31
 
}
 
32
 
32
33
 
33
34
/**
34
35
  Either statement transaction or normal transaction - related
52
53
public:
53
54
  /** Register this storage engine in the given transaction context. */
54
55
  void register_ha(Session_TRANS *trans,
55
 
                   drizzled::plugin::StorageEngine *engine_arg);
 
56
                   plugin::StorageEngine *engine_arg);
56
57
 
57
58
  /** Clear, prepare for reuse. */
58
59
  void reset();
65
66
  /** Mark this transaction read-write if the argument is read-write. */
66
67
  void coalesce_trx_with(const Ha_trx_info *stmt_trx);
67
68
  Ha_trx_info *next() const;
68
 
  drizzled::plugin::StorageEngine *engine() const;
 
69
  plugin::StorageEngine *engine() const;
69
70
 
70
71
private:
71
72
  enum { TRX_READ_ONLY= 0, TRX_READ_WRITE= 1 };
76
77
    for the same storage engine, 'engine' is not-NULL only when the
77
78
    corresponding storage is a part of a transaction.
78
79
  */
79
 
  drizzled::plugin::StorageEngine *m_engine;
 
80
  plugin::StorageEngine *m_engine;
80
81
  /**
81
82
    Transaction flags related to this engine.
82
83
    Not-null only if this instance is a part of transaction.
85
86
  unsigned char       m_flags;
86
87
};
87
88
 
 
89
} /* namespace drizzled */
 
90
 
88
91
#endif /* DRIZZLED_HA_TRX_INFO_H */