← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2010-02-04 15:58:21 UTC
  • mfrom: (1280.1.9 build)
  • Revision ID: brian@gaz-20100204155821-bi4txluiivy043sb
Rollup of Brian, Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
33
33
#include <drizzled/item/int.h>
34
34
#include <drizzled/item/empty_string.h>
35
35
#include <drizzled/replication_services.h>
 
36
#include "drizzled/transaction_services.h"
36
37
#include <drizzled/table_proto.h>
37
38
#include <drizzled/plugin/client.h>
38
39
#include <drizzled/table_identifier.h>
1975
1976
  Item *item;
1976
1977
  LEX *lex= session->lex;
1977
1978
  int result_code= 0;
 
1979
  TransactionServices &transaction_services= TransactionServices::singleton();
1978
1980
  const CHARSET_INFO * const cs= system_charset_info;
1979
1981
 
1980
1982
  if (! session->endActiveTransaction())
2052
2054
      length= snprintf(buff, sizeof(buff), ER(ER_OPEN_AS_READONLY),
2053
2055
                       table_name);
2054
2056
      session->client->store(buff, length);
2055
 
      ha_autocommit_or_rollback(session, 0);
 
2057
      transaction_services.ha_autocommit_or_rollback(session, false);
2056
2058
      session->endTransaction(COMMIT);
2057
2059
      session->close_thread_tables();
2058
2060
      lex->reset_query_tables_list(false);
2175
2177
        }
2176
2178
      }
2177
2179
    }
2178
 
    ha_autocommit_or_rollback(session, 0);
 
2180
    transaction_services.ha_autocommit_or_rollback(session, false);
2179
2181
    session->endTransaction(COMMIT);
2180
2182
    session->close_thread_tables();
2181
2183
    table->table=0;                             // For query cache
2187
2189
  return(false);
2188
2190
 
2189
2191
err:
2190
 
  ha_autocommit_or_rollback(session, 1);
 
2192
  transaction_services.ha_autocommit_or_rollback(session, true);
2191
2193
  session->endTransaction(ROLLBACK);
2192
2194
  session->close_thread_tables();                       // Shouldn't be needed
2193
2195
  if (table)