← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_table.cc

  • Committer: Brian Aker
  • Date: 2011-02-17 10:09:00 UTC
  • mfrom: (2173.2.1 clean-include-usuage)
  • Revision ID: brian@tangent.org-20110217100900-4tpuxxzdl1sj00sh
Merge Monty for headers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_table.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems
 
4
 *  Copyright (C) 2009 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
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
{
33
33
 delete (drop) tables.
34
34
 
35
35
  SYNOPSIS
36
 
   mysql_rm_table()
 
36
   rm_table()
37
37
   session                      Thread handle
38
38
   tables               List of tables to delete
39
39
   if_exists            If 1, don't give error if one table doesn't exists
53
53
 
54
54
*/
55
55
 
56
 
static bool mysql_rm_table(Session *session, TableList *tables, bool if_exists, bool drop_temporary)
 
56
static bool rm_table(Session *session, TableList *tables, bool if_exists, bool drop_temporary)
57
57
{
58
58
  bool error, need_start_waiting= false;
59
59
 
70
70
    table::Cache::singleton().mutex() during wait_if_global_read_lock(), other threads could not
71
71
    close their tables. This would make a pretty deadlock.
72
72
  */
73
 
  error= mysql_rm_table_part2(session, tables, if_exists, drop_temporary);
 
73
  error= rm_table_part2(session, tables, if_exists, drop_temporary);
74
74
 
75
75
  if (need_start_waiting)
76
76
  {
87
87
 
88
88
bool statement::DropTable::execute()
89
89
{
90
 
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
91
 
  TableList *all_tables= session->lex->query_tables;
 
90
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
 
91
  TableList *all_tables= getSession()->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 (not session->endActiveTransaction())
 
96
    if (getSession()->inTransaction())
97
97
    {
 
98
      my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
98
99
      return true;
99
100
    }
100
101
  }
101
102
 
102
103
  /* DDL and binlog write order protected by table::Cache::singleton().mutex() */
103
 
  bool res= mysql_rm_table(session,
104
 
                           first_table,
105
 
                           drop_if_exists,
106
 
                           drop_temporary);
107
 
  return res;
 
104
 
 
105
  return rm_table(getSession(), first_table, drop_if_exists, drop_temporary);
108
106
}
109
107
 
110
108
} /* namespace drizzled */