← 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: 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.cc
39
39
#include <drizzled/plugin/client.h>
40
40
#include "drizzled/plugin/scheduler.h"
41
41
#include "drizzled/plugin/authentication.h"
 
42
#include "drizzled/plugin/transactional_storage_engine.h"
42
43
#include "drizzled/probes.h"
43
44
#include "drizzled/table_proto.h"
44
45
#include "drizzled/db.h"
148
149
  return static_cast<void **>(&ha_data[engine->slot].ha_ptr);
149
150
}
150
151
 
151
 
Ha_trx_info *Session::getEngineInfo(const plugin::StorageEngine *engine,
152
 
                                    size_t index)
 
152
ResourceContext *Session::getResourceContext(const plugin::StorageEngine *engine,
 
153
                                             size_t index)
153
154
{
154
 
  return &ha_data[engine->getSlot()].ha_info[index];
 
155
  return &ha_data[engine->getSlot()].resource_context[index];
155
156
}
156
157
 
157
158
extern "C"
256
257
  else
257
258
    options &= ~OPTION_BIG_SELECTS;
258
259
 
259
 
  transaction.all.modified_non_trans_table= transaction.stmt.modified_non_trans_table= false;
260
260
  open_options=ha_open_options;
261
261
  update_lock_default= TL_WRITE;
262
262
  session_tx_isolation= (enum_tx_isolation) variables.tx_isolation;
790
790
      if (transaction_services.ha_commit_trans(this, true))
791
791
        result= false;
792
792
      options&= ~(OPTION_BEGIN);
793
 
      transaction.all.modified_non_trans_table= false;
794
793
      break;
795
794
    case COMMIT_RELEASE:
796
795
      do_release= 1; /* fall through */
808
807
      if (transaction_services.ha_rollback_trans(this, true))
809
808
        result= false;
810
809
      options&= ~(OPTION_BEGIN);
811
 
      transaction.all.modified_non_trans_table= false;
812
810
      if (result == true && (completion == ROLLBACK_AND_CHAIN))
813
811
        result= startTransaction();
814
812
      break;
843
841
      result= false;
844
842
  }
845
843
  options&= ~(OPTION_BEGIN);
846
 
  transaction.all.modified_non_trans_table= false;
847
844
  return result;
848
845
}
849
846
 
862
859
 
863
860
    if (opt == START_TRANS_OPT_WITH_CONS_SNAPSHOT)
864
861
    {
865
 
      // TODO make this a loop for all engines, not just this one (Inno only
866
 
      // right now)
867
 
      if (plugin::StorageEngine::startConsistentSnapshot(this))
 
862
      if (plugin::TransactionalStorageEngine::startConsistentSnapshot(this))
868
863
      {
869
864
        result= false;
870
865
      }
1695
1690
 
1696
1691
int session_non_transactional_update(const Session *session)
1697
1692
{
1698
 
  return(session->transaction.all.modified_non_trans_table);
 
1693
  return(session->transaction.all.hasModifiedNonTransData());
1699
1694
}
1700
1695
 
1701
1696
void session_mark_transaction_to_rollback(Session *session, bool all)
1773
1768
  server_status&= ~ (SERVER_MORE_RESULTS_EXISTS |
1774
1769
                          SERVER_QUERY_NO_INDEX_USED |
1775
1770
                          SERVER_QUERY_NO_GOOD_INDEX_USED);
1776
 
  /*
1777
 
    If in autocommit mode and not in a transaction, reset
1778
 
    OPTION_STATUS_NO_TRANS_UPDATE to not get warnings
1779
 
    in ha_rollback_trans() about some tables couldn't be rolled back.
1780
 
  */
1781
 
  if (!(options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
1782
 
  {
1783
 
    transaction.all.modified_non_trans_table= false;
1784
 
  }
1785
1771
 
1786
1772
  clear_error();
1787
1773
  main_da.reset_diagnostics_area();