← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_index.cc

  • Committer: Brian Aker
  • Date: 2010-01-22 00:53:13 UTC
  • Revision ID: brian@gaz-20100122005313-jmizcbcdi1lt4tcx
Revert db patch.

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
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
22
 
 
23
 
#include <drizzled/show.h>
24
 
#include <drizzled/session.h>
25
 
#include <drizzled/statement/drop_index.h>
26
 
#include <drizzled/statement/alter_table.h>
27
 
#include <drizzled/plugin/storage_engine.h>
 
21
#include "config.h"
 
22
#include "drizzled/show.h"
 
23
#include "drizzled/session.h"
 
24
#include "drizzled/statement/drop_index.h"
 
25
#include "drizzled/statement/alter_table.h"
 
26
#include "drizzled/db.h"
28
27
 
29
28
namespace drizzled
30
29
{
31
30
 
32
31
bool statement::DropIndex::execute()
33
32
{
34
 
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
35
 
  TableList *all_tables= getSession()->getLex()->query_tables;
36
 
 
37
 
  /* Chicken/Egg... we need to search for the table, to know if the table exists, so we can build a full identifier from it */
38
 
  message::table::shared_ptr original_table_message;
39
 
  {
40
 
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
41
 
    if (not (original_table_message= plugin::StorageEngine::getTableMessage(*getSession(), identifier)))
42
 
    {
43
 
      my_error(ER_BAD_TABLE_ERROR, identifier);
44
 
      return true;
45
 
    }
46
 
  }
47
 
 
 
33
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
 
34
  TableList *all_tables= session->lex->query_tables;
48
35
  /*
49
36
     CREATE INDEX and DROP INDEX are implemented by calling ALTER
50
37
     TABLE with proper arguments.
57
44
  HA_CREATE_INFO create_info;
58
45
 
59
46
  assert(first_table == all_tables && first_table != 0);
60
 
  if (getSession()->inTransaction())
 
47
  if (! session->endActiveTransaction())
61
48
  {
62
 
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
63
49
    return true;
64
50
  }
65
51
 
 
52
  memset(&create_info, 0, sizeof(create_info));
66
53
  create_info.db_type= 0;
67
 
 
68
 
  bool res;
69
 
  if (original_table_message->type() == message::Table::STANDARD )
70
 
  {
71
 
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
72
 
 
73
 
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
74
 
 
75
 
    res= alter_table(getSession(), 
76
 
                     identifier,
77
 
                     identifier,
78
 
                     &create_info, 
79
 
                     *original_table_message,
80
 
                     create_table_proto, 
81
 
                     first_table,
82
 
                     &alter_info,
83
 
                     0, (Order*) 0, 0);
84
 
  }
85
 
  else
86
 
  {
87
 
    identifier::Table catch22(first_table->getSchemaName(), first_table->getTableName());
88
 
    Table *table= getSession()->find_temporary_table(catch22);
89
 
    assert(table);
90
 
    {
91
 
      identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName(), table->getShare()->getPath());
92
 
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
93
 
 
94
 
      res= alter_table(getSession(), 
95
 
                       identifier,
96
 
                       identifier,
97
 
                       &create_info, 
98
 
                       *original_table_message,
99
 
                       create_table_proto, 
100
 
                       first_table,
101
 
                       &alter_info,
102
 
                       0, (Order*) 0, 0);
103
 
    }
104
 
  }
 
54
  create_info.row_type= ROW_TYPE_NOT_USED;
 
55
  create_info.default_table_charset= get_default_db_collation(session->db.c_str());
 
56
 
 
57
  bool res= alter_table(session, 
 
58
                        first_table->db, 
 
59
                        first_table->table_name,
 
60
                        &create_info, 
 
61
                        &create_table_proto, 
 
62
                        first_table,
 
63
                        &alter_info,
 
64
                        0, (order_st*) 0, 0);
105
65
  return res;
106
66
}
107
67