← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.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:
drizzled/statement/alter_table.cc
721
721
   We set this flag so that ha_innobase::open and ::external_lock() do
722
722
   not complain when we lock the table
723
723
 */
724
 
  session->tablespace_op= true;
 
724
  session->setDoingTablespaceOperation(true);
725
725
  if (not (table= session->openTableLock(table_list, TL_WRITE)))
726
726
  {
727
 
    session->tablespace_op= false;
 
727
    session->setDoingTablespaceOperation(false);
728
728
    return -1;
729
729
  }
730
730
 
750
750
  } while(0);
751
751
 
752
752
  (void) transaction_services.autocommitOrRollback(*session, error);
753
 
  session->tablespace_op=false;
 
753
  session->setDoingTablespaceOperation(false);
754
754
 
755
755
  if (error == 0)
756
756
  {