← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_table.cc

edit

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_table.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/lock.h>
25
25
#include <drizzled/statement/drop_table.h>
26
 
#include <drizzled/sql_table.h>
 
26
#include "drizzled/sql_table.h"
27
27
 
28
28
namespace drizzled
29
29
{
87
87
 
88
88
bool statement::DropTable::execute()
89
89
{
90
 
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
91
 
  TableList *all_tables= getSession()->getLex()->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() */
104
103
 
105
 
  return rm_table(getSession(), first_table, drop_if_exists, drop_temporary);
 
104
  return rm_table(session, first_table, drop_if_exists, drop_temporary);
106
105
}
107
106
 
108
107
} /* namespace drizzled */