← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

  • Committer: Lee Bieber
  • Date: 2011-02-10 21:02:41 UTC
  • mfrom: (2154.1.3 build)
  • Revision ID: kalebral@gmail.com-20110210210241-jouae2uw2pwv6bac
Merge Patrick - 715885: dbqp needs to return non-zero if tests fail
Merge Stewart - 715539: (get|set)_session_proc_info() still exists
Merge Stewart - 715575: misc session_foo() functions exist - should be methods in Session
Merge Stewart - 712843: SAVEPOINT after rollback due to deadlock with autocommit=off in transaction will call startTransaction with an existing transaction where one shouldn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
353
353
  (void)options;
354
354
 
355
355
  transaction= get_trx(session);
356
 
  isolation_level= tx_isolation_to_ib_trx_level((enum_tx_isolation)session_tx_isolation(session));
 
356
  isolation_level= tx_isolation_to_ib_trx_level(session->getTxIsolation());
357
357
  *transaction= ib_trx_begin(isolation_level);
358
358
 
359
359
  return *transaction == NULL;
649
649
 
650
650
  /* the below is adapted from ha_innodb.cc */
651
651
 
652
 
  const uint32_t sql_command = session_sql_command(session);
 
652
  const uint32_t sql_command = session->getSqlCommand();
653
653
 
654
654
  if (sql_command == SQLCOM_DROP_TABLE) {
655
655
 
680
680
    unexpected if an obsolete consistent read view would be
681
681
    used. */
682
682
 
683
 
    enum_tx_isolation isolation_level= session_tx_isolation(session);
 
683
    enum_tx_isolation isolation_level= session->getTxIsolation();
684
684
 
685
685
    if (isolation_level != ISO_SERIALIZABLE
686
686
        && (lock_type == TL_READ || lock_type == TL_READ_NO_INSERT)
723
723
 
724
724
    if ((lock_type >= TL_WRITE_CONCURRENT_INSERT
725
725
         && lock_type <= TL_WRITE)
726
 
        && !session_tablespace_op(session)
 
726
        && ! session->doing_tablespace_operation()
727
727
        && sql_command != SQLCOM_TRUNCATE
728
728
        && sql_command != SQLCOM_CREATE_TABLE) {
729
729
 
2123
2123
     so only support TRUNCATE and not DELETE FROM t;
2124
2124
     (this is what ha_innodb does)
2125
2125
  */
2126
 
  if (session_sql_command(getTable()->in_use) != SQLCOM_TRUNCATE)
 
2126
  if (getTable()->in_use->getSqlCommand() != SQLCOM_TRUNCATE)
2127
2127
    return HA_ERR_WRONG_COMMAND;
2128
2128
 
2129
2129
  ib_id_t id;