← 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-04-06 06:50:19 UTC
  • mfrom: (1405.3.9 replication-api)
  • Revision ID: brian@gaz-20100406065019-n387mztxp1i75qel
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1829
1829
      length= snprintf(buff, sizeof(buff), ER(ER_OPEN_AS_READONLY),
1830
1830
                       table_name);
1831
1831
      session->client->store(buff, length);
1832
 
      transaction_services.ha_autocommit_or_rollback(session, false);
 
1832
      transaction_services.autocommitOrRollback(session, false);
1833
1833
      session->endTransaction(COMMIT);
1834
1834
      session->close_thread_tables();
1835
1835
      lex->reset_query_tables_list(false);
1952
1952
        }
1953
1953
      }
1954
1954
    }
1955
 
    transaction_services.ha_autocommit_or_rollback(session, false);
 
1955
    transaction_services.autocommitOrRollback(session, false);
1956
1956
    session->endTransaction(COMMIT);
1957
1957
    session->close_thread_tables();
1958
1958
    table->table=0;                             // For query cache
1964
1964
  return(false);
1965
1965
 
1966
1966
err:
1967
 
  transaction_services.ha_autocommit_or_rollback(session, true);
 
1967
  transaction_services.autocommitOrRollback(session, true);
1968
1968
  session->endTransaction(ROLLBACK);
1969
1969
  session->close_thread_tables();                       // Shouldn't be needed
1970
1970
  if (table)