← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_table.cc

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

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
#include <drizzled/sql_lex.h>
27
28
 
28
29
namespace drizzled
29
30
{
55
56
 
56
57
static bool rm_table(Session *session, TableList *tables, bool if_exists, bool drop_temporary)
57
58
{
58
 
  bool error, need_start_waiting= false;
 
59
  bool need_start_waiting= false;
59
60
 
60
61
  /* mark for close and remove all cached entries */
61
62
 
66
67
  }
67
68
 
68
69
  /*
69
 
    Acquire table::Cache::singleton().mutex() after wait_if_global_read_lock(). If we would hold
70
 
    table::Cache::singleton().mutex() during wait_if_global_read_lock(), other threads could not
 
70
    Acquire table::Cache::mutex() after wait_if_global_read_lock(). If we would hold
 
71
    table::Cache::mutex() during wait_if_global_read_lock(), other threads could not
71
72
    close their tables. This would make a pretty deadlock.
72
73
  */
73
 
  error= rm_table_part2(session, tables, if_exists, drop_temporary);
 
74
  bool error= rm_table_part2(session, tables, if_exists, drop_temporary);
74
75
 
75
76
  if (need_start_waiting)
76
77
  {
87
88
 
88
89
bool statement::DropTable::execute()
89
90
{
90
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
91
 
  TableList *all_tables= getSession()->lex->query_tables;
 
91
  TableList *first_table= (TableList *) lex().select_lex.table_list.first;
 
92
  TableList *all_tables= lex().query_tables;
92
93
  assert(first_table == all_tables && first_table != 0);
93
94
 
94
95
  if (not drop_temporary)
95
96
  {
96
 
    if (getSession()->inTransaction())
 
97
    if (session().inTransaction())
97
98
    {
98
99
      my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
99
100
      return true;
100
101
    }
101
102
  }
102
103
 
103
 
  /* DDL and binlog write order protected by table::Cache::singleton().mutex() */
 
104
  /* DDL and binlog write order protected by table::Cache::mutex() */
104
105
 
105
 
  return rm_table(getSession(), first_table, drop_if_exists, drop_temporary);
 
106
  return rm_table(&session(), first_table, drop_if_exists, drop_temporary);
106
107
}
107
108
 
108
109
} /* namespace drizzled */