← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_table.cc

  • Committer: Stewart Smith
  • Date: 2011-01-14 05:14:53 UTC
  • mto: (2086.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2087.
  • Revision ID: stewart@flamingspork.com-20110114051453-q8nkbvby6n12cpqw
add some FIXMEs to ORDER BY docs about what should be added.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_table.cc
87
87
 
88
88
bool statement::DropTable::execute()
89
89
{
90
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
91
 
  TableList *all_tables= getSession()->lex->query_tables;
 
90
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
 
91
  TableList *all_tables= session->lex->query_tables;
92
92
  assert(first_table == all_tables && first_table != 0);
93
93
 
94
94
  if (not drop_temporary)
95
95
  {
96
 
    if (getSession()->inTransaction())
 
96
    if (not session->endActiveTransaction())
97
97
    {
98
 
      my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
99
98
      return true;
100
99
    }
101
100
  }
102
101
 
103
102
  /* DDL and binlog write order protected by table::Cache::singleton().mutex() */
 
103
  bool res= rm_table(session, first_table, drop_if_exists, drop_temporary);
104
104
 
105
 
  return rm_table(getSession(), first_table, drop_if_exists, drop_temporary);
 
105
  return res;
106
106
}
107
107
 
108
108
} /* namespace drizzled */