← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_index.cc

  • Committer: Patrick Crews
  • Date: 2010-12-07 20:02:50 UTC
  • Revision ID: gleebix@gmail.com-20101207200250-6a27jgqalgw5bsb5
Added disabled.def file to disable drizzleslap due to Bug#684269.  Need to skip for tarball release this round

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_index.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, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
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
19
19
 */
20
20
 
21
21
#include "config.h"
22
 
 
23
22
#include "drizzled/show.h"
24
23
#include "drizzled/session.h"
25
24
#include "drizzled/statement/drop_index.h"
26
25
#include "drizzled/statement/alter_table.h"
27
26
#include "drizzled/db.h"
28
 
#include "drizzled/plugin/storage_engine.h"
29
27
 
30
28
namespace drizzled
31
29
{
32
30
 
33
31
bool statement::DropIndex::execute()
34
32
{
35
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
36
 
  TableList *all_tables= getSession()->lex->query_tables;
 
33
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
 
34
  TableList *all_tables= session->lex->query_tables;
37
35
 
38
36
  /* Chicken/Egg... we need to search for the table, to know if the table exists, so we can build a full identifier from it */
39
37
  message::table::shared_ptr original_table_message;
40
38
  {
41
 
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
42
 
    if (plugin::StorageEngine::getTableDefinition(*getSession(), identifier, original_table_message) != EEXIST)
 
39
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
 
40
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
43
41
    {
44
 
      my_error(ER_BAD_TABLE_ERROR, identifier);
 
42
      std::string path;
 
43
      identifier.getSQLPath(path);
 
44
      my_error(ER_BAD_TABLE_ERROR, MYF(0), path.c_str());
45
45
      return true;
46
46
    }
47
47
  }
58
58
  HA_CREATE_INFO create_info;
59
59
 
60
60
  assert(first_table == all_tables && first_table != 0);
61
 
  if (getSession()->inTransaction())
 
61
  if (! session->endActiveTransaction())
62
62
  {
63
 
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
64
63
    return true;
65
64
  }
66
65
 
 
66
  memset(&create_info, 0, sizeof(create_info));
67
67
  create_info.db_type= 0;
68
68
 
69
69
  bool res;
70
70
  if (original_table_message->type() == message::Table::STANDARD )
71
71
  {
72
 
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
 
72
    TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName());
73
73
 
74
74
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
75
75
 
76
 
    res= alter_table(getSession(), 
 
76
    res= alter_table(session, 
77
77
                     identifier,
78
78
                     identifier,
79
79
                     &create_info, 
85
85
  }
86
86
  else
87
87
  {
88
 
    identifier::Table catch22(first_table->getSchemaName(), first_table->getTableName());
89
 
    Table *table= getSession()->find_temporary_table(catch22);
 
88
    TableIdentifier catch22(first_table->getSchemaName(), first_table->getTableName());
 
89
    Table *table= session->find_temporary_table(catch22);
90
90
    assert(table);
91
91
    {
92
 
      identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName(), table->getShare()->getPath());
 
92
      TableIdentifier identifier(first_table->getSchemaName(), first_table->getTableName(), table->getShare()->getPath());
93
93
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
94
94
 
95
 
      res= alter_table(getSession(), 
 
95
      res= alter_table(session, 
96
96
                       identifier,
97
97
                       identifier,
98
98
                       &create_info,