← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Brian Aker
  • Date: 2010-02-19 16:34:09 UTC
  • mfrom: (1273.13.92 build)
  • Revision ID: brian@gaz-20100219163409-wh45g0p6fzdsed6r
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
25
25
 
26
26
#include "drizzled/plugin.h"
27
27
#include <drizzled/sql_locale.h>
28
 
#include <drizzled/ha_trx_info.h>
 
28
#include "drizzled/resource_context.h"
29
29
#include <drizzled/cursor.h>
30
30
#include <drizzled/current_session.h>
31
31
#include <drizzled/sql_error.h>
34
34
#include <drizzled/xid.h>
35
35
#include "drizzled/query_id.h"
36
36
#include "drizzled/named_savepoint.h"
 
37
#include "drizzled/transaction_context.h"
37
38
 
38
39
#include <netdb.h>
39
40
#include <map>
320
321
    this should not be used.
321
322
    @sa trans_register_ha()
322
323
  */
323
 
  Ha_trx_info ha_info[2];
 
324
  drizzled::ResourceContext resource_context[2];
324
325
 
325
326
  Ha_data() :ha_ptr(NULL) {}
326
327
};
539
540
  query_id_t warn_query_id;
540
541
public:
541
542
  void **getEngineData(const plugin::StorageEngine *engine);
542
 
  Ha_trx_info *getEngineInfo(const plugin::StorageEngine *engine,
543
 
                             size_t index= 0);
 
543
  ResourceContext *getResourceContext(const plugin::StorageEngine *engine,
 
544
                                      size_t index= 0);
544
545
 
545
546
  struct st_transactions {
546
 
    std::deque<drizzled::NamedSavepoint> savepoints;
547
 
    Session_TRANS all;                  // Trans since BEGIN WORK
548
 
    Session_TRANS stmt;                 // Trans for current statement
 
547
    std::deque<NamedSavepoint> savepoints;
 
548
    TransactionContext all; ///< Trans since BEGIN WORK
 
549
    TransactionContext stmt; ///< Trans for current statement
549
550
    XID_STATE xid_state;
550
551
 
551
 
    /*
552
 
       Tables changed in transaction (that must be invalidated in query cache).
553
 
       List contain only transactional tables, that not invalidated in query
554
 
       cache (instead of full list of changed in transaction tables).
555
 
    */
556
552
    void cleanup()
557
553
    {
558
554
      savepoints.clear();
564
560
      xid_state()
565
561
    { }
566
562
  } transaction;
 
563
 
567
564
  Field *dup_field;
568
565
  sigset_t signals;
569
566